]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Reintegrate: make merge-fix-up more noticeable
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Feb 2011 22:54:41 +0000 (14:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Feb 2011 22:54:41 +0000 (14:54 -0800)
Reintegrate

index 2f036279264c38df5509e6875de838b230c9e8fb..653a13229cb0c93c4c2c8156b6de4ebf6a653bf7 100755 (executable)
@@ -53,6 +53,7 @@ no)
                                :
                        elif git show-ref -q --verify "refs/merge-fix/$branch"
                        then
+                               echo >&2 "Fixing up the merge"
                                git cherry-pick --no-commit "refs/merge-fix/$branch" &&
                                EDITOR=: git commit --amend -a || exit
                        fi