From 8a419eb2ac0f50202757f4aea217c735e6fd4b4c Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Dec 2010 15:35:04 -0800
Subject: [PATCH] Reintegrate: abort the whole thing when commit is aborted

---
 Reintegrate | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Reintegrate b/Reintegrate
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" "*)