diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-15 01:37:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-15 01:37:13 (GMT) |
| commit | f0acaa6b1cea3acd0b7bd137ee7b74d90f2946f5 (patch) | |
| tree | 2f81b8bd48cdb60c87cbd4acc92d268effc0f504 /Documentation | |
| parent | e919f559645fb184a7660d7aeeaa5c97c5c6aa46 (diff) | |
| parent | 16a86d432913db209214e03206c0ec7e14b8a562 (diff) | |
| download | git-f0acaa6b1cea3acd0b7bd137ee7b74d90f2946f5.zip git-f0acaa6b1cea3acd0b7bd137ee7b74d90f2946f5.tar.gz git-f0acaa6b1cea3acd0b7bd137ee7b74d90f2946f5.tar.bz2 | |
Merge branch 'nd/apply-doc' into maint
A minor documentation update.
* nd/apply-doc:
git-apply.txt: mention the behavior inside a subdir
git-apply.txt: remove a space
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-apply.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index d9ed6a1..8ddb207 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -13,7 +13,7 @@ SYNOPSIS [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse] [--allow-binary-replacement | --binary] [--reject] [-z] [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached] - [--ignore-space-change | --ignore-whitespace ] + [--ignore-space-change | --ignore-whitespace] [--whitespace=(nowarn|warn|fix|error|error-all)] [--exclude=<path>] [--include=<path>] [--directory=<root>] [--verbose] [--unsafe-paths] [<patch>...] @@ -21,6 +21,8 @@ SYNOPSIS DESCRIPTION ----------- Reads the supplied diff output (i.e. "a patch") and applies it to files. +When running from a subdirectory in a repository, patched paths +outside the directory are ignored. With the `--index` option the patch is also applied to the index, and with the `--cached` option the patch is only applied to the index. Without these options, the command applies the patch only to files, |