]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
"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

1  2 
apply.c patch | diff1 | diff2 | blob | history

diff --cc apply.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.