]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commit2f713668784266b4682816fadcf2034d846e9cc1
tree22af9c76e4c6fcd9663c68d10fd0152725285e65
parentae2d05d0c6b1834cfcfc5e060db6cf8d91160c5b
parent42f8ed6ca24854141c34aa82472ca126fdaeaf65
Merge branch 'ds/add-with-sparse-index'

"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
builtin/add.c