diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-28 14:40:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-28 14:40:57 -0700 |
| commit | ec40f134aa677499a0c1bf7ea6133b7b5fe348c4 (patch) | |
| tree | ccfbc4d2f3b9dbf94015ba91975a7166105221f7 /git-apply.txt | |
| parent | 7578608bd24d16e08ff2c765d8e2aada854fee57 (diff) | |
| download | git-htmldocs-ec40f134aa677499a0c1bf7ea6133b7b5fe348c4.tar.gz | |
Autogenerated HTML docs for v2.18.0-129-ge3331
Diffstat (limited to 'git-apply.txt')
| -rw-r--r-- | git-apply.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/git-apply.txt b/git-apply.txt index 67228494c..b9aa39000 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -9,7 +9,7 @@ git-apply - Apply a patch to files and/or to the index SYNOPSIS -------- [verse] -'git apply' [--stat] [--numstat] [--summary] [--check] [--index] [--3way] +'git apply' [--stat] [--numstat] [--summary] [--check] [--index | --intent-to-add] [--3way] [--apply] [--no-add] [--build-fake-ancestor=<file>] [-R | --reverse] [--allow-binary-replacement | --binary] [--reject] [-z] [-p<n>] [-C<n>] [--inaccurate-eof] [--recount] [--cached] @@ -74,6 +74,14 @@ OPTIONS cached data, apply the patch, and store the result in the index without using the working tree. This implies `--index`. +--intent-to-add:: + When applying the patch only to the working tree, mark new + files to be added to the index later (see `--intent-to-add` + option in linkgit:git-add[1]). This option is ignored unless + running in a Git repository and `--index` is not specified. + Note that `--index` could be implied by other options such + as `--cached` or `--3way`. + -3:: --3way:: When the patch does not apply cleanly, fall back on 3-way merge if |