diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-08-04 13:28:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-04 13:28:54 -0700 |
| commit | 1a6fb019d6c09f5e7e2b76fab2a6ad50a8506461 (patch) | |
| tree | b2fe947618c9af0df5becfd1d58ff91f14b0c37b /Documentation/config/diff.txt | |
| parent | Merge branch 'ds/commit-and-checkout-with-sparse-index' (diff) | |
| parent | merge-ort: restart merge with cached renames to reduce process entry cost (diff) | |
| download | tgif-1a6fb019d6c09f5e7e2b76fab2a6ad50a8506461.tar.xz | |
Merge branch 'en/ort-perf-batch-14'
Further optimization on "merge -sort" backend.
* en/ort-perf-batch-14:
merge-ort: restart merge with cached renames to reduce process entry cost
merge-ort: avoid recursing into directories when we don't need to
merge-ort: defer recursing into directories when merge base is matched
merge-ort: add a handle_deferred_entries() helper function
merge-ort: add data structures for allowable trivial directory resolves
merge-ort: add some more explanations in collect_merge_info_callback()
merge-ort: resolve paths early when we have sufficient information
Diffstat (limited to 'Documentation/config/diff.txt')
0 files changed, 0 insertions, 0 deletions