Merge branch 'jc/diff-algo-attribute'

Junio C Hamano committed over 3 years ago

Merge branch 'pw/rebase-i-validate-labels-early'

Junio C Hamano committed over 3 years ago

restore: fault --staged --worktree with merge opts

Andy Koppe committed over 3 years ago

fetch: support hideRefs to speed up connectivity checks

Eric Wong committed over 3 years ago

test-lib: drop comment about test_description

Andrei Rybak committed over 3 years ago

unpack-trees: add usage notices around df_conflict_entry

Elijah Newren committed over 3 years ago

unpack-trees: special case read-tree debugging as internal usage

Elijah Newren committed over 3 years ago

unpack-trees: rewrap a few overlong lines from previous patch

Elijah Newren committed over 3 years ago

unpack-trees: mark fields only used internally as internal

Elijah Newren committed over 3 years ago

unpack_trees: start splitting internal fields from public API

Elijah Newren committed over 3 years ago

sparse-checkout: avoid using internal API of unpack-trees, take 2

Elijah Newren committed over 3 years ago

sparse-checkout: avoid using internal API of unpack-trees

Elijah Newren committed over 3 years ago

unpack-trees: clean up some flow control

Elijah Newren committed over 3 years ago

dir: mark output only fields of dir_struct as such

Elijah Newren committed over 3 years ago

dir: add a usage note to exclude_per_dir

Elijah Newren committed over 3 years ago

dir: separate public from internal portion of dir_struct

Elijah Newren committed over 3 years ago

unpack-trees: heed requests to overwrite ignored files

Elijah Newren committed over 3 years ago

t2021: fix platform-specific leftover cruft

Elijah Newren committed over 3 years ago

drop pure pass-through config callbacks

Jeff King committed over 3 years ago

fsck: check even zero-entry index files

Jeff King committed over 3 years ago