diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:53 -0800 |
| commit | bc61dbac770923a96e2007c3de4027c5d11c6d41 (patch) | |
| tree | c6f487d5fbdf0bb91185002a2d5e6744ac8f5b16 /builtin/notes.c | |
| parent | Merge branch 'hn/reftable-fixes' (diff) | |
| parent | git-apply: skip threeway in add / rename cases (diff) | |
| download | git-bc61dbac770923a96e2007c3de4027c5d11c6d41.tar.gz git-bc61dbac770923a96e2007c3de4027c5d11c6d41.zip | |
Merge branch 'jz/apply-3-corner-cases'
"git apply --3way" bypasses the attempt to do a three-way
application in more cases to address the regression caused by the
recent change to use direct application as a fallback.
* jz/apply-3-corner-cases:
git-apply: skip threeway in add / rename cases
Diffstat (limited to 'builtin/notes.c')
0 files changed, 0 insertions, 0 deletions