summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2006-01-31 05:36:24 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-01 00:22:01 (GMT)
commite36f8b6034f9df7e7b0aea912d1c8e850503623e (patch)
treed2b6bb7ac9e7fc39cdc8858e55a1e544be6d2eed /Documentation
parentc8568e139ed2149fbfb7ef9a8d819d5b6b7c554f (diff)
downloadgit-e36f8b6034f9df7e7b0aea912d1c8e850503623e.zip
git-e36f8b6034f9df7e7b0aea912d1c8e850503623e.tar.gz
git-e36f8b6034f9df7e7b0aea912d1c8e850503623e.tar.bz2
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.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 51c7d47..75076b6 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