]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ds/add-with-sparse-index' into ds/sparse-index-ignored-files
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Aug 2021 20:39:14 +0000 (13:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Aug 2021 20:39:14 +0000 (13:39 -0700)
commit716f68ec33e3506babee03c4df497a7e211220ee
treec38809dad506a7508ee2b53f60556ab059a31121
parent2d755dfac9aadab25c3e025b849252b8c0a61465
parent42f8ed6ca24854141c34aa82472ca126fdaeaf65
Merge branch 'ds/add-with-sparse-index' into ds/sparse-index-ignored-files

* 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