diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-15 13:36:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-15 13:36:01 -0700 |
| commit | 5a7e52bed263c1dbc181ece54b73ee4318e79fca (patch) | |
| tree | df12b136643c70bbdd24bc0676efb064649ee760 /Documentation | |
| parent | b98db1dd7002f52f3b61b7487dde7043e740ad8a (diff) | |
| parent | c0c2a37ac2b9338c3a93340cbcbab69690da4df0 (diff) | |
| download | git-5a7e52bed263c1dbc181ece54b73ee4318e79fca.tar.xz | |
Merge branch 'jz/apply-3way-cached'
"git apply" now takes "--3way" and "--cached" at the same time, and
work and record results only in the index.
* jz/apply-3way-cached:
git-apply: allow simultaneous --cached and --3way options
Diffstat (limited to '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 9144575299..aa1ae56a25 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -87,8 +87,10 @@ OPTIONS Attempt 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally, possibly leaving the conflict markers in the files in the working tree for the user to - resolve. This option implies the `--index` option, and is incompatible - with the `--reject` and the `--cached` options. + resolve. This option implies the `--index` option unless the + `--cached` option is used, and is incompatible with the `--reject` option. + When used with the `--cached` option, any conflicts are left at higher stages + in the cache. --build-fake-ancestor=<file>:: Newer 'git diff' output has embedded 'index information' |