diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-16 17:42:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-16 17:42:45 -0700 |
| commit | fdbcdfcf61a64a1c2d2dd58c1a9111b45b6c1536 (patch) | |
| tree | 4cd0716eb64769a46256a78c6f2adc33c479be30 /merge-recursive.c | |
| parent | 89efac81c716bb296098fd1c5482bac3ecb344c5 (diff) | |
| parent | 2bff554b23e8d5c17f4e6827358bb51811fc7137 (diff) | |
Merge branch 'en/ort-perf-batch-13'
Performance tweaks of "git merge -sort" around lazy fetching of objects.
* en/ort-perf-batch-13:
merge-ort: add prefetching for content merges
diffcore-rename: use a different prefetch for basename comparisons
diffcore-rename: allow different missing_object_cb functions
t6421: add tests checking for excessive object downloads during merge
promisor-remote: output trace2 statistics for number of objects fetched
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions