diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 16:07:42 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 16:07:42 +0900 |
| commit | b9d9d90d180cf21baeeb16bd89828d25c7901470 (patch) | |
| tree | a40241052af8d4f5543b66581e3f0235cfae0af3 /git-apply.txt | |
| parent | ccb8252b46bfba5daf0cfcedaf0f9d2e14ba356f (diff) | |
| download | git-htmldocs-b9d9d90d180cf21baeeb16bd89828d25c7901470.tar.gz | |
Autogenerated HTML docs for v2.17.0-775-ge144d
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/git-apply.txt b/git-apply.txt index 4ebc3d327..67228494c 100644 --- a/git-apply.txt +++ b/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 @@ -240,7 +242,7 @@ When `git apply` is used as a "better GNU patch", the user can pass the `--unsafe-paths` option to override this safety check. This option has no effect when `--index` or `--cached` is in use. -Configuration +CONFIGURATION ------------- apply.ignoreWhitespace:: @@ -251,7 +253,7 @@ apply.whitespace:: When no `--whitespace` flag is given from the command line, this configuration item is used as the default. -Submodules +SUBMODULES ---------- If the patch contains any changes to submodules then 'git apply' treats these changes as follows. |