3 # Copyright (c) 2010 Junio C Hamano.
10 git am
--resolved
--resolvemsg
="$resolvemsg" &&
11 move_to_original_branch
15 git am
--skip
--resolvemsg
="$resolvemsg" &&
16 move_to_original_branch
21 test -n
"$rebase_root" && root_flag
=--root
23 git format-patch
-k
--stdout
--full-index
--ignore-if-in-upstream \
24 --src-prefix
=a
/ --dst-prefix
=b
/ \
25 --no-renames
$root_flag "$revisions" |
26 git am
$git_am_opt --rebasing
--resolvemsg
="$resolvemsg" &&
27 move_to_original_branch
29 test 0 != $ret -a
-d
"$state_dir" && write_basic_state