diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:11 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:11 +0900 |
| commit | ece48106e6bd7c5c29f6bed8141586e789b43223 (patch) | |
| tree | da98102b2950ceb458fd4d5d0fb54f6573291081 | |
| parent | d9a0ddc217b74615b901ad4dfdde04bfbde59770 (diff) | |
| parent | ee930754d8f61ffa21535b83c81b3d48cd222e0a (diff) | |
| download | git-ece48106e6bd7c5c29f6bed8141586e789b43223.tar.xz | |
Merge branch 'jk/apply-p-doc'
Doc update.
* jk/apply-p-doc:
apply: clarify "-p" 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 4ebc3d3271..c993fbf714 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 |