From 86b0be18d61512aba73c84b6256752273cf73ebf Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 24 Oct 2014 15:26:00 -0700 Subject: [PATCH] Meta/Reintegrate: show what happened during the fix-up --- Reintegrate | 1 + 1 file changed, 1 insertion(+) diff --git a/Reintegrate b/Reintegrate index 2be5bd659a..f6d32b55ed 100755 --- a/Reintegrate +++ b/Reintegrate @@ -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 ;;