]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Nov 2021 20:53:56 +0000 (12:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Nov 2021 20:53:56 +0000 (12:53 -0800)
* vd/sparse-reset:
  unpack-trees: improve performance of next_cache_entry
  reset: make --mixed sparse-aware
  reset: make sparse-aware (except --mixed)
  reset: integrate with sparse index
  reset: expand test coverage for sparse checkouts
  sparse-index: update command for expand/collapse test
  reset: preserve skip-worktree bit in mixed reset
  reset: rename is_missing to !is_in_reset_tree

1  2 
builtin/reset.c
cache.h
read-cache.c
t/t1092-sparse-checkout-compatibility.sh
unpack-trees.c

diff --cc builtin/reset.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc read-cache.c
Simple merge
diff --cc unpack-trees.c
Simple merge