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

diff --git a/merge_akpm b/merge_akpm
index c1bb89d9544ceecb56b1d84b109c9a6af0172233..255b767c7067f7264716aa17ed211638aa733ae5 100755 (executable)
--- 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