t7800: Test difftool passing arguments to diff
[git/mjg.git] / git-rebase--am.sh
blobc815a2412c2f33556ad712d328eaa80241c07bda
1 #!/bin/sh
3 # Copyright (c) 2010 Junio C Hamano.
6 . git-sh-setup
8 case "$action" in
9 continue)
10 git am --resolved --resolvemsg="$resolvemsg" &&
11 move_to_original_branch
12 exit
14 skip)
15 git am --skip --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" && write_basic_state
30 exit $ret