From cd84af4a2c2976ab86a8462cfe54520ddfa27cab Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Fri, 12 Jun 2015 08:15:46 +1000 Subject: [PATCH] do_merge: Pause when the commit fails --- do_merge | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/do_merge b/do_merge index 47e02d8..f463e60 100755 --- a/do_merge +++ b/do_merge @@ -136,7 +136,9 @@ for h in $heads; do bash -i || exit } # [ "$(git status --porcelain)" ] && { - GIT_EDITOR=: execute git commit -v -a + GIT_EDITOR=: execute git commit -v -a || { + bash -i || exit + } execute git diff -M --stat --summary 'HEAD^..' # } } -- 2.39.5