diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-12 06:05:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-12 06:05:36 (GMT) |
| commit | 2092a1fefdacf9839332202fa62165e2ac91c899 (patch) | |
| tree | 59a28d8ea65428fd6410b19eb9b5c63b64331d43 /git-am.sh | |
| parent | c5c3fc9851e6c89f8616729552d9b8a8dfea5555 (diff) | |
| download | git-2092a1fefdacf9839332202fa62165e2ac91c899.zip git-2092a1fefdacf9839332202fa62165e2ac91c899.tar.gz git-2092a1fefdacf9839332202fa62165e2ac91c899.tar.bz2 | |
Teach git-am to pass -p option down to git-apply
This is originally from Andy Parkins whose patch used --patchdepth; let's
use -p which is more in line with the underlying git-apply.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-am.sh')
| -rwxr-xr-x | git-am.sh | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -3,7 +3,7 @@ # Copyright (c) 2005, 2006 Junio C Hamano USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way] - [--interactive] [--whitespace=<option>] [-CNUM] <mbox>... + [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] <mbox>... or, when resuming [--skip | --resolved]' . git-sh-setup set_reflog_action am @@ -142,10 +142,7 @@ do --sk|--ski|--skip) skip=t; shift ;; - --whitespace=*) - git_apply_opt="$git_apply_opt $1"; shift ;; - - -C*) + --whitespace=*|-C*|-p*) git_apply_opt="$git_apply_opt $1"; shift ;; --resolvemsg=*) |