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 /Documentation/git-am.txt | |
| parent | c5c3fc9851e6c89f8616729552d9b8a8dfea5555 (diff) | |
| download | git-2092a1fefdacf9839332202fa62165e2ac91c899.tar.gz | |
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 'Documentation/git-am.txt')
| -rw-r--r-- | Documentation/git-am.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 77ef103b21..4fb1d84413 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:: |