]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commit3cfbb7b3f79ed99690d86c112f233723423d1baf
tree1098aea98ac8b20018fdc738416192badac25f15
parentf7ae594a851ff7ceef3b2b6c959ea18bdc940363
parentb2eec6663f10a53dead5e7a4e5e9b91220bf9473
Merge branch 'en/ort-cached-rename-with-trivial-resolution'

"ort" merge backend improvements.

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