]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'en/merge-ort-perf'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Feb 2021 21:58:43 +0000 (13:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Feb 2021 21:58:44 +0000 (13:58 -0800)
commitd3a035b055c81634ce99ab5fa5476a52d33029fe
tree925f5541e5b02e516f4fd9675a65df73a60c4ed9
parenta21e27ef6bd72e38ec96a2b1a259eb48759c1d48
parent557ac0350d9efa1f59c708779ca3fb3aee121131
Merge branch 'en/merge-ort-perf'

The "ort" merge strategy.

* en/merge-ort-perf:
  merge-ort: begin performance work; instrument with trace2_region_* calls
  merge-ort: ignore the directory rename split conflict for now
  merge-ort: fix massive leak