diff options
| author | Jeff King <peff@peff.net> | 2018-05-10 14:29:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-11 03:34:17 (GMT) |
| commit | ee930754d8f61ffa21535b83c81b3d48cd222e0a (patch) | |
| tree | 944a2fe48a89993e0fc6eb1b19b1df5882157916 /Documentation | |
| parent | 468165c1d8a442994a825f3684528361727cd8c0 (diff) | |
| download | git-ee930754d8f61ffa21535b83c81b3d48cd222e0a.zip git-ee930754d8f61ffa21535b83c81b3d48cd222e0a.tar.gz git-ee930754d8f61ffa21535b83c81b3d48cd222e0a.tar.bz2 | |
apply: clarify "-p" documentation
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-apply.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 4ebc3d3..c993fbf 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -113,8 +113,10 @@ explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). -p<n>:: - Remove <n> leading slashes from traditional diff paths. The - default is 1. + Remove <n> leading path components (separated by slashes) from + 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>:: Ensure at least <n> lines of surrounding context match before |