mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/apply-p-doc'

Browse Source 
Doc update.

* jk/apply-p-doc:
  apply: clarify "-p" documentation
This commit is contained in:
Junio C Hamano
2018-05-23 14:38:11 +09:00
parent d9a0ddc217 ee930754d8
commit ece48106e6
1 changed files with 4 additions and 2 deletions
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