diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-15 23:36:00 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-15 23:36:00 +0300 |
| commit | 771c758e8a89d4d7aa482e7f98d8878214630301 (patch) | |
| tree | 681efee93c48430236a591033b3fe47ed92ecc53 /contrib/completion/git-completion.bash | |
| parent | 54a391711554ed41b4b0792cfef004abc74893bd (diff) | |
| parent | 923cd87ac8550a8e277bfeb19198a11b6a8ed854 (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
Diffstat (limited to 'contrib/completion/git-completion.bash')
0 files changed, 0 insertions, 0 deletions