rebase: show consistent conflict resolution hint
[git/dscho.git] / git-rebase--am.sh
blob263987c55db053b3cb5455704b5206f272599fb8
1 #!/bin/sh
3 # Copyright (c) 2010 Junio C Hamano.
6 . git-sh-setup
8 case "$action" in
9 continue)
10 git am --resolved --3way --resolvemsg="$resolvemsg" &&
11 move_to_original_branch
12 exit
14 skip)
15 git am --skip -3 --resolvemsg="$resolvemsg" &&
16 move_to_original_branch
17 exit
19 esac
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
28 ret=$?
29 test 0 != $ret -a -d "$state_dir" &&
30 echo $head_name > "$state_dir/head-name" &&
31 echo $onto > "$state_dir/onto" &&
32 echo $orig_head > "$state_dir/orig-head" &&
33 echo "$GIT_QUIET" > "$state_dir/quiet"
34 exit $ret