From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 15 May 2014 01:18:23 +0000 (+1000)
Subject: do_merge: always do the commit after a manual fixup
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=c219dfc5aee53273ac69ddbd18f121ad65cdc853;p=next-scripts

do_merge: always do the commit after a manual fixup
---

diff --git a/do_merge b/do_merge
index 58ef07c..cb110cc 100755
--- a/do_merge
+++ b/do_merge
@@ -120,10 +120,10 @@ for h in $heads; do
 			git diff 2>&1 | egrep -q '<<<<<|^\*' && {
 				bash -i || exit
 			}
-			[ "$(git status --porcelain)" ] && {
+#			[ "$(git status --porcelain)" ] && {
 				GIT_EDITOR=: execute git commit -v -a
 				execute git diff -M --stat --summary 'HEAD^..'
-			}
+#			}
 		}
 		;;
 	esac