Reintegrate: make merge-fix-up more noticeable
Junio C Hamano committed
Feb 22, 2011 at 14:54 UTC
cc5f90c07c65ddec33465fec526bb6ce2aa5a8da
1 file changed
+1
Reintegrate
+1
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