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>
Jeff King committed
May 10, 2018 at 10:29 UTC
ee930754d8f61ffa21535b83c81b3d48cd222e0a
1 file changed
+4
-2
Documentation/git-apply.txt
+4
-2
@@ -113,8 +113,10 @@ explained for the configuration variable `core.quotePath` (see
113
linkgit:git-config[1]).
114
115
-p<n>::
116
- Remove <n> leading slashes from traditional diff paths. The
117
- default is 1.
116
+ Remove <n> leading path components (separated by slashes) from
117
+ traditional diff paths. E.g., with `-p2`, a patch against
118
+ `a/dir/file` will be applied directly to `file`. The default is
119
+ 1.
120
121
-C<n>::
122
Ensure at least <n> lines of surrounding context match before