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
@@ -53,6 +53,7 @@ no)
53
:
54
elif git show-ref -q --verify "refs/merge-fix/$branch"
55
then
56
+ echo >&2 "Fixing up the merge"
57
git cherry-pick --no-commit "refs/merge-fix/$branch" &&
58
EDITOR=: git commit --amend -a || exit
59
fi