Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtest
Junio C Hamano committed about 5 years ago
pull: abort if --ff-only is given and fast-forwarding is impossible
Alex Henrie committed about 5 years ago
t7601: add tests of interactions with multiple merge heads and config
Elijah Newren committed about 5 years ago
t7601: test interaction of merge/rebase/fast-forward flags and options
Elijah Newren committed about 5 years ago
pack-bitmap: clarify comment in filter_bitmap_exclude_type()
Taylor Blau committed about 5 years ago
unpack-trees: resolve sparse-directory/file conflicts
Derrick Stolee committed about 5 years ago
t1092: document bad 'git checkout' behavior
Derrick Stolee committed about 5 years ago
doc: clarify description of 'submodule.recurse'
Philippe Blain committed about 5 years ago
doc/git-config: simplify "override" advice for FILES section
Jeff King committed about 5 years ago
doc/git-config: clarify GIT_CONFIG environment variable
Jeff King committed about 5 years ago
doc/git-config: explain --file instead of referring to GIT_CONFIG
Jeff King committed about 5 years ago
merge-ort: restart merge with cached renames to reduce process entry cost
Elijah Newren committed about 5 years ago
merge-ort: avoid recursing into directories when we don't need to
Elijah Newren committed about 5 years ago
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