Merge branch 'ky/branch-d-worktree'

Junio C Hamano committed over 10 years ago

Merge branch 'rz/worktree-no-checkout'

Junio C Hamano committed over 10 years ago

Merge branch 'rt/rebase-i-shorten-stop-report'

Junio C Hamano committed over 10 years ago

Merge branch 'rt/completion-help'

Junio C Hamano committed over 10 years ago

Merge branch 'ak/use-hashmap-iter-first-in-submodule-config'

Junio C Hamano committed over 10 years ago

Merge branch 'jk/check-repository-format'

Junio C Hamano committed over 10 years ago

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

t3404: use write_script

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

t5532: use write_script

Jeff King committed over 10 years ago