diff options
| author | Michael S. Tsirkin <mst@mellanox.co.il> | 2007-02-08 16:57:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-09 02:23:52 +0300 |
| commit | 67dad687ad15d26d8e26f4d27874af0bc0965ce2 (patch) | |
| tree | 4a6d436ff71e9c83a9196a73596f3c6f6aaebd20 /git-rebase.sh | |
| parent | 66e788bc7fd1888cb4834a48006128a6217f88af (diff) | |
add -C[NUM] to git-am
Add -C[NUM] to git-am and git-rebase so that patches can be applied even
if context has changed a bit.
Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 9d2f71d15c..b51d19d12e 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -45,6 +45,7 @@ do_merge= dotest=$GIT_DIR/.dotest-merge prec=4 verbose= +git_am_opt= continue_merge () { test -n "$prev_head" || die "prev_head must be defined" @@ -213,6 +214,10 @@ do -v|--verbose) verbose=t ;; + -C*) + git_am_opt=$1 + shift + ;; -*) usage ;; @@ -322,7 +327,7 @@ fi 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 |