]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7ae594 b2eec66)
Merge branch 'en/ort-cached-rename-with-trivial-resolution'
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 May 2026 13:58:30 +0000 (22:58 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 May 2026 13:58:30 +0000 (22:58 +0900)
"ort" merge backend improvements.

* en/ort-cached-rename-with-trivial-resolution:
  merge-ort: handle cached rename & trivial resolution interaction better


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.