From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Sep 2021 22:20:44 +0000 (-0700)
Subject: Merge branch 'ds/mergies-with-sparse-index'
X-Git-Tag: v2.34.0-rc0~144
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a16dd1374023d1a5f6ee7c48661e0ed53a954391;p=thirdparty%2Fgit.git

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
---

a16dd1374023d1a5f6ee7c48661e0ed53a954391