diff options
| author | Daniel Barkalow <barkalow@iabervon.org> | 2006-01-31 00:36:24 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-31 16:22:01 -0800 |
| commit | e36f8b6034f9df7e7b0aea912d1c8e850503623e (patch) | |
| tree | d2b6bb7ac9e7fc39cdc8858e55a1e544be6d2eed /Documentation | |
| parent | c8568e139ed2149fbfb7ef9a8d819d5b6b7c554f (diff) | |
| download | git-e36f8b6034f9df7e7b0aea912d1c8e850503623e.tar.gz | |
Make apply accept the -pNUM option like patch does.
This only applies to traditional diffs, not to git diffs.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-apply.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 51c7d47092..75076b6121 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] - [--no-add] [--index-info] [--allow-binary-replacement] [-z] + [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] [<patch>...] DESCRIPTION @@ -68,6 +68,10 @@ OPTIONS backslash characters replaced with `\t`, `\n`, and `\\`, respectively. +-p<n>:: + Remove <n> leading slashes from traditional diff paths. The + default is 1. + --apply:: If you use any of the options marked ``Turns off "apply"'' above, git-apply reads and outputs the |