diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-04-15 13:36:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-15 13:36:00 -0700 |
| commit | 771c758e8a89d4d7aa482e7f98d8878214630301 (patch) | |
| tree | 681efee93c48430236a591033b3fe47ed92ecc53 /Documentation | |
| parent | The ninth batch (diff) | |
| parent | git-apply: try threeway first when "--3way" is used (diff) | |
| download | tgif-771c758e8a89d4d7aa482e7f98d8878214630301.tar.xz | |
Merge branch 'jz/apply-run-3way-first'
"git apply --3way" has always been "to fall back to 3-way merge
only when straight application fails". Swap the order of falling
back so that 3-way is always attempted first (only when the option
is given, of course) and then straight patch application is used as
a fallback when it fails.
* jz/apply-run-3way-first:
git-apply: try threeway first when "--3way" is used
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-apply.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 91d9a8601c..9144575299 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -84,9 +84,8 @@ OPTIONS -3:: --3way:: - When the patch does not apply cleanly, fall back on 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 + 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. |