undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apply: clarify "-p" documentation

Browse Source 
We're not really removing slashes, but slash-separated path
components. Let's make that more clear.

Reported-by: kelly elton <its.the.doc@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2018-05-10 10:29:24 -04:00 committed by Junio C Hamano
parent 468165c1d8
commit ee930754d8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-apply.txt
View File

@ -113,8 +113,10 @@ explained for the configuration variable `core.quotePath` (see
linkgit:git-config[1]). linkgit:git-config[1]).
-p<n>:: -p<n>::
Remove <n> leading slashes from traditional diff paths. The Remove <n> leading path components (separated by slashes) from
default is 1. traditional diff paths. E.g., with `-p2`, a patch against
`a/dir/file` will be applied directly to `file`. The default is
1.
-C<n>:: -C<n>::
Ensure at least <n> lines of surrounding context match before Ensure at least <n> lines of surrounding context match before