summaryrefslogtreecommitdiff
path: root/t/t3410-rebase-preserve-dropped-merges.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-04-08 13:23:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-04-08 13:23:26 -0700
commit1b31224e59750f515f7ceb7adab2a7609371327d (patch)
tree7e62424501bc30eed85d3990b2b709227d3f25b2 /t/t3410-rebase-preserve-dropped-merges.sh
parentMerge branch 'en/sequencer-edit-upon-conflict-fix' (diff)
parentdiffcore-rename: avoid doing basename comparisons for irrelevant sources (diff)
downloadtgif-1b31224e59750f515f7ceb7adab2a7609371327d.tar.xz
Merge branch 'en/ort-perf-batch-9'
The ort merge backend has been optimized by skipping irrelevant renames. * en/ort-perf-batch-9: diffcore-rename: avoid doing basename comparisons for irrelevant sources merge-ort: skip rename detection entirely if possible merge-ort: use relevant_sources to filter possible rename sources merge-ort: precompute whether directory rename detection is needed merge-ort: introduce wrappers for alternate tree traversal merge-ort: add data structures for an alternate tree traversal merge-ort: precompute subset of sources for which we need rename detection diffcore-rename: enable filtering possible rename sources
Diffstat (limited to 't/t3410-rebase-preserve-dropped-merges.sh')
0 files changed, 0 insertions, 0 deletions