From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Oct 2014 22:26:00 +0000 (-0700)
Subject: Meta/Reintegrate: show what happened during the fix-up
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86b0be18d61512aba73c84b6256752273cf73ebf;p=thirdparty%2Fgit.git

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

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
 			;;