]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'en/ort-cached-rename-with-trivial-resolution' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2026 01:08:24 +0000 (10:08 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2026 01:08:24 +0000 (10:08 +0900)
commit9fe24668d9dceda65c856873265b38703f27aa9b
treed5214e7e605964f305f643b4cd19b4d5e47dd838
parentb41904c1d33f71c53d96c6eae9799bd1cf2b5eca
parentb2eec6663f10a53dead5e7a4e5e9b91220bf9473
Merge branch 'en/ort-cached-rename-with-trivial-resolution' into next

"ort" merge backend improvements.

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