Reintegrate: abort the whole thing when commit is aborted

2010-12-08 15:35:04 -08:00 · 2010-12-08 15:35:04 -08:00 · 8a419eb2ac
parent fde117a9bf
commit 8a419eb2ac
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -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" "*)