- git branch akpm/current
- execute git merge --no-edit --no-stat "$dnb"
- git branch akpm/master-base
- ;;
- \>*)
- cbranch="${f#>}"
- [ "$cbranch" ] &&
- cref="$(git rev-parse --verify HEAD)"
- ;;
- \<)
- [ "$cbranch" ] && {
- [ "$cref" != "$(git rev-parse --verify HEAD)" ] &&
- git branch -f "akpm/$cbranch"
- cbranch=""
+ execute git branch tmp-akpm/current ||
+ $SHELL -i || exit
+ execute git merge --no-edit --no-stat "$dnb" || {
+ check_unmerged_files akpm-current
+
+ git diff 2>&1 | grep -E -q '<<<<<|^\*' && {
+ $SHELL -i || exit
+ }
+ GIT_EDITOR=: execute git commit -v -a
+ }
+ [ -f "../merge-fixes/akpm-current" ] && {
+ for p in $(cat "../merge-fixes/akpm-current"); do
+ $(dirname $0)/merge_fix -n "$p" ||
+ $SHELL -i || exit
+ done