Merge commit 'effc2cae2d3f'

[next-scripts] / merge_akpm

diff --git a/merge_akpm b/merge_akpm
index c1bb89d9544ceecb56b1d84b109c9a6af0172233..f7670dbcf1a6594488905294705a14771ec6bd7d 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
@@ -83,6 +83,7 @@ execute git rebase --onto master remotes/origin/akpm/master-base || {
        bash -i || exit
 }
 echo "fix up?"
+notify-send "Waiting for akpm fix up"
 bash -i
 log '$' cd $cpwd
 cd $cpwd