Browse Source

Merge branch 'jk/apply-p-doc'

Doc update.

* jk/apply-p-doc:
  apply: clarify "-p" documentation
maint
Junio C Hamano 7 years ago
parent
commit
ece48106e6
  1. 6
      Documentation/git-apply.txt

6
Documentation/git-apply.txt

@ -113,8 +113,10 @@ explained for the configuration variable `core.quotePath` (see @@ -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

Loading…
Cancel
Save