]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ds/add-with-sparse-index'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Aug 2021 22:32:35 +0000 (15:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Aug 2021 22:32:35 +0000 (15:32 -0700)
"git add" can work better with the sparse index.

* ds/add-with-sparse-index:
  add: remove ensure_full_index() with --renormalize
  add: ignore outside the sparse-checkout in refresh()
  pathspec: stop calling ensure_full_index
  add: allow operating on a sparse-only index
  t1092: test merge conflicts outside cone

1  2 
builtin/add.c

diff --cc builtin/add.c
Simple merge