merge-ort: defer recursing into directories when merge base is matched

Elijah Newren committed about 5 years ago

merge-ort: add a handle_deferred_entries() helper function

Elijah Newren committed about 5 years ago

merge-ort: add data structures for allowable trivial directory resolves

Elijah Newren committed about 5 years ago

merge-ort: add some more explanations in collect_merge_info_callback()

Elijah Newren committed about 5 years ago

merge-ort: resolve paths early when we have sufficient information

Elijah Newren committed about 5 years ago

t0000: fix test if run with TEST_OUTPUT_DIRECTORY

Patrick Steinhardt committed about 5 years ago

multi-pack-index: fix potential segfault without sub-command

Taylor Blau committed about 5 years ago

refs/debug: quote prefix

Han-Wen Nienhuys committed about 5 years ago

t0000: clear GIT_SKIP_TESTS before running sub-tests

Jeff King committed about 5 years ago

test-lib-functions: use test-tool for [de]packetize()

Ævar Arnfjörð Bjarmason committed about 5 years ago

The fifth batch

Junio C Hamano committed about 5 years ago

Merge branch 'ds/gender-neutral-doc'

Junio C Hamano committed about 5 years ago

Merge branch 'jt/partial-clone-submodule-1'

Junio C Hamano committed about 5 years ago

Merge branch 'ab/struct-init'

Junio C Hamano committed about 5 years ago

Merge branch 'dd/test-stdout-count-lines'

Junio C Hamano committed about 5 years ago

Merge branch 'hn/refs-test-cleanup'

Junio C Hamano committed about 5 years ago

Merge branch 'rs/khash-alloc-cleanup'

Junio C Hamano committed about 5 years ago

Merge branch 'ar/help-micro-cleanup'

Junio C Hamano committed about 5 years ago

Merge branch 'ar/submodule-helper-include-cleanup'

Junio C Hamano committed about 5 years ago

Merge branch 'ab/bundle-updates'

Junio C Hamano committed about 5 years ago