From cc5f90c07c65ddec33465fec526bb6ce2aa5a8da Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 22 Feb 2011 14:54:41 -0800 Subject: [PATCH] Reintegrate: make merge-fix-up more noticeable --- Reintegrate | 1 + 1 file changed, 1 insertion(+) diff --git a/Reintegrate b/Reintegrate index 2f03627926..653a13229c 100755 --- a/Reintegrate +++ b/Reintegrate @@ -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