diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-08 14:53:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-08 14:53:48 -0700 |
| commit | 84ea1e42221ac3bab88dda1a6ee25a11802cfef9 (patch) | |
| tree | 77e2756b2438903b8a9403d7f3468f962341b99f /git-apply.txt | |
| parent | bec5da4921ecdf10f30acd425332ad4c40801c8b (diff) | |
| download | git-htmldocs-84ea1e42221ac3bab88dda1a6ee25a11802cfef9.tar.gz | |
Autogenerated HTML docs for v2.8.1-116-g7b0d4
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-apply.txt b/git-apply.txt index d9ed6a1a4..8ddb20740 100644 --- a/git-apply.txt +++ b/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, |