Meta/Reintegrate: show what happened during the fix-up

2026-08-07 08:31:51 +00:00 · 2014-10-24 15:26:00 -07:00
parent d5617a42b0
commit 86b0be18d6
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@@ -167,6 +167,7 @@ no)
 			then
 				echo >&2 "Fixing up the merge"
 				git cherry-pick --no-commit "refs/merge-fix/$branch" &&
+				git diff --stat HEAD &&
 				EDITOR=: git commit --amend -a || exit
 			fi
 			;;