Reintegrate: abort the whole thing when commit is aborted
Junio C Hamano committed
Dec 8, 2010 at 15:35 UTC
8a419eb2ac0f50202757f4aea217c735e6fd4b4c
1 file changed
+1
-1
Reintegrate
+1
-1
index 30065f2122..2f03627926 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -54,7 +54,7 @@ no)
elif git show-ref -q --verify "refs/merge-fix/$branch"
then
git cherry-pick --no-commit "refs/merge-fix/$branch" &&
- EDITOR=: git commit --amend -a
+ EDITOR=: git commit --amend -a || exit
fi
;;
pick" "*)