projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 54a3917 923cd87)
Merge branch 'jz/apply-run-3way-first'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Apr 2021 20:36:00 +0000 (13:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Apr 2021 20:36:00 +0000 (13:36 -0700)
commit771c758e8a89d4d7aa482e7f98d8878214630301
tree681efee93c48430236a591033b3fe47ed92ecc53tree | snapshot
parent54a391711554ed41b4b0792cfef004abc74893bdcommit | diff
parent923cd87ac8550a8e277bfeb19198a11b6a8ed854commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.