From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 Aug 2013 00:25:17 +0000 (+1000)
Subject: merge_akpm: make the merge of akpm-current non-ff
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=fa9840b6611c7d66cdfe8e90a3f922f02a4ff132;p=next-scripts

merge_akpm: make the merge of akpm-current non-ff
---

diff --git a/merge_akpm b/merge_akpm
index c1bb89d..255b767 100755
--- a/merge_akpm
+++ b/merge_akpm
@@ -32,7 +32,7 @@ git branch -f akpm/base HEAD
 old_head=$(git rev-parse HEAD)
 hlog=$(git log -1 --oneline akpm-current/current) 2>/dev/null
 log Merging akpm-current/current "($hlog)"
-execute git merge akpm-current/current || {
+execute git merge --no-ff akpm-current/current || {
 	echo Merge failed 1>&2
 	echo $h >>../merge.debug
 	git diff >>../merge.debug 2>&1