Merge branch 'ap/checkout-no-progress-for-non-tty' into maint
[git] / git-rebase--am.sh
1 #!/bin/sh
2 #
3 # Copyright (c) 2010 Junio C Hamano.
4 #
5
6 . git-sh-setup
7
8 case "$action" in
9 continue)
10         git am --resolved --resolvemsg="$resolvemsg" &&
11         move_to_original_branch
12         exit
13         ;;
14 skip)
15         git am --skip --resolvemsg="$resolvemsg" &&
16         move_to_original_branch
17         exit
18         ;;
19 esac
20
21 test -n "$rebase_root" && root_flag=--root
22
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" && write_basic_state
30 exit $ret