summaryrefslogtreecommitdiff
path: root/t/t6428-merge-conflicts-sparse.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-08-02 14:06:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-08-02 14:06:42 -0700
commit8230107f336b29d25111c517639b8cd5717c8416 (patch)
treeb24d756b13a4877290c6369d9833d8e6e8f28120 /t/t6428-merge-conflicts-sparse.sh
parentMerge branch 'fc/pull-no-rebase-merges-theirs-into-ours' (diff)
parentcache-tree: prefetch in partial clone read-tree (diff)
downloadtgif-8230107f336b29d25111c517639b8cd5717c8416.tar.xz
Merge branch 'jt/bulk-prefetch'
"git read-tree" had a codepath where blobs are fetched one-by-one from the promisor remote, which has been corrected to fetch in bulk. * jt/bulk-prefetch: cache-tree: prefetch in partial clone read-tree unpack-trees: refactor prefetching code
Diffstat (limited to 't/t6428-merge-conflicts-sparse.sh')
0 files changed, 0 insertions, 0 deletions