From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 26 Jun 2013 08:02:56 +0000 (+1000)
Subject: do_merge: make sure we generate a merge commit for each nonempty tree
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=a62ab64ee1d72bb37ddf436aceab0feb4a3ec7f4;p=next-scripts

do_merge: make sure we generate a merge commit for each nonempty tree
---

diff --git a/do_merge b/do_merge
index 0d1cc1b..5deedab 100755
--- a/do_merge
+++ b/do_merge
@@ -113,7 +113,7 @@ for h in $heads; do
 		do_rebase $h $tree
 		;;
 	*)
-		execute git merge $h || {
+		execute git merge --no-ff $h || {
 			echo Merge failed 1>&2
 			echo $h >>../merge.debug
 			git diff >>../merge.debug 2>&1