summaryrefslogtreecommitdiff
path: root/t/t7502-commit-porcelain.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-06-14 13:33:26 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-06-14 13:33:27 +0900
commit169914ede2aa205c5500c7be0501889a8962dc24 (patch)
treeb49d4264fd7a9ceb71b032eca131622c6447eb5b /t/t7502-commit-porcelain.sh
parentMerge branch 'jk/fetch-pack-v2-half-close-early' (diff)
parentmerge-ort, diffcore-rename: employ cached renames when possible (diff)
downloadtgif-169914ede2aa205c5500c7be0501889a8962dc24.tar.xz
Merge branch 'en/ort-perf-batch-11'
Optimize out repeated rename detection in a sequence of mergy operations. * en/ort-perf-batch-11: merge-ort, diffcore-rename: employ cached renames when possible merge-ort: handle interactions of caching and rename/rename(1to1) cases merge-ort: add helper functions for using cached renames merge-ort: preserve cached renames for the appropriate side merge-ort: avoid accidental API mis-use merge-ort: add code to check for whether cached renames can be reused merge-ort: populate caches of rename detection results merge-ort: add data structures for in-memory caching of rename detection t6429: testcases for remembering renames fast-rebase: write conflict state to working tree, index, and HEAD fast-rebase: change assert() to BUG() Documentation/technical: describe remembering renames optimization t6423: rename file within directory that other side renamed
Diffstat (limited to 't/t7502-commit-porcelain.sh')
0 files changed, 0 insertions, 0 deletions