| commit | a16dd1374023d1a5f6ee7c48661e0ed53a954391 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Sep 2021 22:20:44 +0000 (20 15:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 20 Sep 2021 22:20:45 +0000 (20 15:20 -0700) | ||
| tree | 73d6f7e3c1f5ae4ad74cfc76b88002625f948c3f | treesnapshot (tar.gz zip) |
| parent | dc89c34d9e9237293d0ed73adc454fedfc620f74 | commitdiff |
| parent | 516680ba7704c473bb21628aa19cabbd787df4db | commitdiff |
Merge branch 'ds/mergies-with-sparse-index'
Various mergy operations have been prepared to work efficiently
with the sparse index.
* ds/mergies-with-sparse-index:
sparse-index: integrate with cherry-pick and rebase
sequencer: ensure full index if not ORT strategy
t1092: add cherry-pick, rebase tests
merge-ort: expand only for out-of-cone conflicts
merge: make sparse-aware with ORT
diff: ignore sparse paths in diffstat
Various mergy operations have been prepared to work efficiently
with the sparse index.
* ds/mergies-with-sparse-index:
sparse-index: integrate with cherry-pick and rebase
sequencer: ensure full index if not ORT strategy
t1092: add cherry-pick, rebase tests
merge-ort: expand only for out-of-cone conflicts
merge: make sparse-aware with ORT
diff: ignore sparse paths in diffstat