t/lib-httpd: avoid occasional failures when checking access.log
SZEDER Gábor committed about 8 years ago
t/lib-httpd: add the strip_access_log() helper function
SZEDER Gábor committed about 8 years ago
t5541: clean up truncating access log
SZEDER Gábor committed about 8 years ago
rebase --rebase-merges: adjust man page for octopus support
Johannes Schindelin committed over 8 years ago
rebase --rebase-merges: add support for octopus merges
Johannes Schindelin committed over 8 years ago
merge: allow reading the merge commit message from a file
Johannes Schindelin committed over 8 years ago
has_uncommitted_changes(): fall back to empty tree
Jeff King committed about 8 years ago
gpg-interface: make parse_gpg_output static and remove from interface header
Henning Schild committed about 8 years ago
builtin/receive-pack: use check_signature from gpg-interface
Henning Schild committed about 8 years ago
t7405: verify 'merge --abort' works after submodule/path conflicts
Elijah Newren committed about 8 years ago
t7405: add a directory/submodule conflict
Elijah Newren committed about 8 years ago
t7405: add a file/submodule conflict
Elijah Newren committed about 8 years ago
merge: fix misleading pre-merge check documentation
Elijah Newren committed about 8 years ago
merge-recursive: enforce rule that index matches head before merging
Elijah Newren committed about 8 years ago
t6044: add more testcases with staged changes before a merge is invoked
Elijah Newren committed about 8 years ago
merge-recursive: fix assumption that head tree being merged is HEAD
Elijah Newren committed about 8 years ago
merge-recursive: make sure when we say we abort that we actually abort
Elijah Newren committed about 8 years ago
t6044: add a testcase for index matching head, when head doesn't match HEAD
Elijah Newren committed about 8 years ago
unpack-trees: do not fail reset because of unmerged skipped entry
Max Kirillov committed about 8 years ago
t6036: add a failed conflict detection case: regular files, different modes
Elijah Newren committed about 8 years ago