diff --git a/git-rebase.sh b/git-rebase.sh
index 9d2f71d15c47ae69eed57a7301d47c93d5bb070a..b51d19d12e6d5a108f13c4ec60c5f5a6e560ef47 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
dotest=$GIT_DIR/.dotest-merge
prec=4
verbose=
dotest=$GIT_DIR/.dotest-merge
prec=4
verbose=
+git_am_opt=
continue_merge () {
test -n "$prev_head" || die "prev_head must be defined"
continue_merge () {
test -n "$prev_head" || die "prev_head must be defined"
-v|--verbose)
verbose=t
;;
-v|--verbose)
verbose=t
;;
+ -C*)
+ git_am_opt=$1
+ shift
+ ;;
-*)
usage
;;
-*)
usage
;;
if test -z "$do_merge"
then
git-format-patch -k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD |
if test -z "$do_merge"
then
git-format-patch -k --stdout --full-index --ignore-if-in-upstream "$upstream"..ORIG_HEAD |
- git am --binary -3 -k --resolvemsg="$RESOLVEMSG"
+ git am $git_am_opt --binary -3 -k --resolvemsg="$RESOLVEMSG"
exit $?
fi
exit $?
fi