From 95252c629223f1613d710abd6d3b6723da13f3ce Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 4 Mar 2014 16:57:35 +1100 Subject: [PATCH] do_merge: don;t commit anything after an empty fixup and don't show the diff --- do_merge | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/do_merge b/do_merge index 0d1cc1b..58ef07c 100755 --- a/do_merge +++ b/do_merge @@ -120,8 +120,10 @@ for h in $heads; do git diff 2>&1 | egrep -q '<<<<<|^\*' && { bash -i || exit } - GIT_EDITOR=: execute git commit -v -a - execute git diff -M --stat --summary 'HEAD^..' + [ "$(git status --porcelain)" ] && { + GIT_EDITOR=: execute git commit -v -a + execute git diff -M --stat --summary 'HEAD^..' + } } ;; esac -- 2.39.5