diff options
| author | Michael S. Tsirkin <mst@mellanox.co.il> | 2007-02-08 15:57:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-08 15:23:52 -0800 |
| commit | 67dad687ad15d26d8e26f4d27874af0bc0965ce2 (patch) | |
| tree | 4a6d436ff71e9c83a9196a73596f3c6f6aaebd20 /git-am.sh | |
| parent | 66e788bc7fd1888cb4834a48006128a6217f88af (diff) | |
| download | git-67dad687ad15d26d8e26f4d27874af0bc0965ce2.tar.gz git-67dad687ad15d26d8e26f4d27874af0bc0965ce2.tar.xz | |
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-am.sh')
| -rwxr-xr-x | git-am.sh | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -3,7 +3,7 @@ # Copyright (c) 2005, 2006 Junio C Hamano USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way] - [--interactive] [--whitespace=<option>] <mbox>... + [--interactive] [--whitespace=<option>] [-CNUM] <mbox>... or, when resuming [--skip | --resolved]' . git-sh-setup set_reflog_action am @@ -106,7 +106,8 @@ It does not apply to blobs recorded in its index." } prec=4 -dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= ws= resolvemsg= +dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= resolvemsg= +git_apply_opt= while case "$#" in 0) break;; esac do @@ -142,7 +143,10 @@ do skip=t; shift ;; --whitespace=*) - ws=$1; shift ;; + git_apply_opt="$git_apply_opt $1"; shift ;; + + -C*) + git_apply_opt="$git_apply_opt $1"; shift ;; --resolvemsg=*) resolvemsg=$(echo "$1" | sed -e "s/^--resolvemsg=//"); shift ;; @@ -394,7 +398,7 @@ do case "$resolved" in '') - git-apply $binary --index $ws "$dotest/patch" + git-apply $git_apply_opt $binary --index "$dotest/patch" apply_status=$? ;; t) |