Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
apply: clarify "-p" documentation
author
Jeff King
<peff@peff.net>
Thu, 10 May 2018 14:29:24 +0000
(10:29 -0400)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 11 May 2018 03:34:17 +0000
(12:34 +0900)
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>
Documentation/git-apply.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
468165c
)
diff --git
a/Documentation/git-apply.txt
b/Documentation/git-apply.txt
index 4ebc3d32719dfefa988d34b41871f0e9fb969471..c993fbf714d6d531105dfa0d8a9f024304bc0164 100644
(file)
--- 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