Merge branch 'ua/t1517-short-help-tests' into dk/help-all

Junio C Hamano committed about 1 year ago

doc: git-log: fix description list

Kristoffer Haugsbakk committed about 1 year ago

t0450: fix test for out-of-tree builds

Toon Claes committed about 1 year ago

remote.c: convert if-else ladder to switch

Denton Liu committed about 1 year ago

remote.c: remove BUG in show_push_unqualified_ref_name_error()

Denton Liu committed about 1 year ago

t5516: remove surrounding empty lines in test bodies

Denton Liu committed about 1 year ago

diff: ensure consistent diff behavior with ignore options

Lidong Yan committed about 1 year ago

t5304: move `prune -h` test from t1517

Usman Akinyemi committed about 1 year ago

t5200: move `update-server-info -h` test from t1517

Usman Akinyemi committed about 1 year ago

t/t1517: automate `git subcmd -h` tests outside a repository

Usman Akinyemi committed about 1 year ago

diff: teach tree-diff a max-depth parameter

Jeff King committed about 1 year ago

within_depth: fix return for empty path

Toon Claes committed about 1 year ago

combine-diff: zero memory used for callback filepairs

Jeff King committed about 1 year ago

merge-ort: fix directory rename on top of source of other rename/delete

Elijah Newren committed about 1 year ago

merge-ort: fix incorrect file handling

Elijah Newren committed about 1 year ago

merge-ort: clarify the interning of strings in opt->priv->path

Elijah Newren committed about 1 year ago

t6423: fix missed staging of file in testcases 12i,12j,12k

Elijah Newren committed about 1 year ago

t6423: document two bugs with rename-to-self testcases

Elijah Newren committed about 1 year ago

merge-ort: drop unnecessary temporary in check_for_directory_rename()

Elijah Newren committed about 1 year ago

merge-ort: update comments to modern testfile location

Elijah Newren committed about 1 year ago