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

sequencer: don't say BUG on bogus input

Jeff King committed about 8 years ago

sequencer: handle empty-set cases consistently

Jeff King committed about 8 years ago

convert log_ref_write_fd() to use strbuf

Ben Peart committed about 8 years ago

utf8.c: avoid char overflow

Beat Bolli committed about 8 years ago

string-list.c: avoid conversion from void * to function pointer

Beat Bolli committed about 8 years ago

sequencer.c: avoid empty statements at top level

Beat Bolli committed about 8 years ago

convert.c: replace "\e" escapes with "\033".

Beat Bolli committed about 8 years ago

fixup! refs/refs-internal.h: avoid forward declaration of an enum

Junio C Hamano committed about 8 years ago

refs/refs-internal.h: avoid forward declaration of an enum

Beat Bolli committed about 8 years ago

fixup! connect.h: avoid forward declaration of an enum

Junio C Hamano committed about 8 years ago