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 /t/t5543-atomic-push.sh | |
| 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 't/t5543-atomic-push.sh')
0 files changed, 0 insertions, 0 deletions