Junio C Hamano a16dd13740 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

2021-09-20 15:20:45 -07:00

164 KiB

Raw Blame History

View Raw