Reintegrate: abort the whole thing when commit is aborted

diff --git a/Reintegrate b/Reintegrate
index 30065f21221c489eaf1332061200c9026fcc57de..2f036279264c38df5509e6875de838b230c9e8fb 100755 (executable)
--- 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" "*)