+git update-ref "refs/next/$today/akpm-current" akpm/current
+git branch -f akpm-current/current akpm/current
+
+git branch -f akpm/base HEAD
+
+hlog=$(git log -1 --oneline akpm-current/current) 2>/dev/null
+log Merging akpm-current/current "($hlog)"
+execute git merge akpm-current/current || {
+ echo Merge failed 1>&2
+ echo $h >>../merge.debug
+ git diff >>../merge.debug 2>&1
+ git diff 2>&1 | egrep -q '<<<<<|^\*' && {
+ bash -i || exit
+ }
+ GIT_EDITOR=: execute git commit -v -a
+ execute git diff -M --stat --summary 'HEAD^..'
+}
+