]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 78e696c 34d6070)
Merge branch 'jz/apply-3-corner-cases'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2022 19:52:53 +0000 (11:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jan 2022 19:52:53 +0000 (11:52 -0800)
commitbc61dbac770923a96e2007c3de4027c5d11c6d41
treec6f487d5fbdf0bb91185002a2d5e6744ac8f5b16tree | snapshot
parent78e696c9dd709a14933f4f4595f0412ed6a008e9commit | diff
parent34d607032c0db6a6c68754e7a339c3caf08d6a79commit | diff
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
apply.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.