]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Reintegrate: show what happened during the fix-up
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 22:26:00 +0000 (15:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 22:26:00 +0000 (15:26 -0700)
Reintegrate

index 2be5bd659ac71914c5c6cf2e5abf00e59c1e9615..f6d32b55eda4c83c9967ec865d62819168361868 100755 (executable)
@@ -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
                        ;;