i18n: branch: move comment for translators
Vasco Almeida committed over 10 years ago
i18n: branch: unmark string for translation
Vasco Almeida committed over 10 years ago
send-email: detect and offer to skip backup files
Junio C Hamano committed over 10 years ago
t6044: new merge testcases for when index doesn't match HEAD
Elijah Newren committed over 10 years ago
merge-octopus: abort if index does not match HEAD
Elijah Newren committed over 10 years ago
builtin/merge.c: fix a bug with trivial merges
Elijah Newren committed over 10 years ago
t7605: add a testcase demonstrating a bug with trivial merges
Elijah Newren committed over 10 years ago
merge-recursive: do not check working copy when creating a virtual merge base
Elijah Newren committed over 10 years ago
merge-recursive: remove duplicate code
Elijah Newren committed over 10 years ago
i18n: builtin/rm.c: remove a comma ',' from string
Vasco Almeida committed over 10 years ago
i18n: unpack-trees: mark strings for translation
Vasco Almeida committed over 10 years ago
Junio C Hamano committed over 10 years ago
t1020: do not overuse printf and use write_script
Junio C Hamano committed over 10 years ago
Jeff King committed over 10 years ago
refs: on symref reflog expire, lock symref not referrent
David Turner committed over 10 years ago
refs: move resolve_ref_unsafe into common code
David Turner committed over 10 years ago
show_head_ref(): check the result of resolve_ref_namespace()
Michael Haggerty committed over 10 years ago
check_aliased_update(): check that dst_name is non-NULL
Michael Haggerty committed over 10 years ago
checkout_paths(): remove unneeded flag variable
Michael Haggerty committed over 10 years ago
cmd_merge(): remove unneeded flag variable
Michael Haggerty committed over 10 years ago