diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-06-14 13:33:26 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-06-14 13:33:27 +0900 |
| commit | 169914ede2aa205c5500c7be0501889a8962dc24 (patch) | |
| tree | b49d4264fd7a9ceb71b032eca131622c6447eb5b /commit.c | |
| parent | 4dd75a195b06680cf43dd7c116b53a561ae8d11c (diff) | |
| parent | 25e65b6dd52c987056f1cac00fe6073fbf8ea237 (diff) | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions