diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-11 22:05:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-11 22:05:36 -0800 |
| commit | 2092a1fefdacf9839332202fa62165e2ac91c899 (patch) | |
| tree | 59a28d8ea65428fd6410b19eb9b5c63b64331d43 | |
| parent | c5c3fc9851e6c89f8616729552d9b8a8dfea5555 (diff) | |
| download | git-2092a1fefdacf9839332202fa62165e2ac91c899.tar.gz git-2092a1fefdacf9839332202fa62165e2ac91c899.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-am.txt | 7 | ||||
| -rwxr-xr-x | git-am.sh | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 77ef103b2..4fb1d8441 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -10,7 +10,8 @@ SYNOPSIS -------- [verse] 'git-am' [--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way] - [--interactive] [--whitespace=<option>] <mbox>... + [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] + <mbox>... 'git-am' [--skip | --resolved] DESCRIPTION @@ -68,8 +69,8 @@ default. You could use `--no-utf8` to override this. This flag is passed to the `git-apply` program that applies the patch. --C<n>:: - This flag is passed to the `git-apply` program that applies +-C<n>, -p<n>:: + These flag are passed to the `git-apply` program that applies the patch. --interactive:: @@ -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=*) |