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


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