RE: [PATCH] Avoid rename/add conflict when contents are identical
Schalk, Ken committed about 16 years ago
Merge branch 'ab/compat-regex'
Junio C Hamano committed about 16 years ago
Merge branch 'nd/clone-depth-zero'
Junio C Hamano committed about 16 years ago
Merge branch 'jn/maint-doc-user-manual-html-doctype'
Junio C Hamano committed about 16 years ago
Merge branch 'cb/maint-mergetool-no-tty'
Junio C Hamano committed about 16 years ago
Merge branch 'jn/apply-filename-with-sp'
Junio C Hamano committed about 16 years ago
Merge branch 'jn/merge-custom-no-trivial'
Junio C Hamano committed about 16 years ago
Merge branch 'jc/maint-doc-em-dash'
Junio C Hamano committed about 16 years ago
Junio C Hamano committed about 16 years ago
Merge branch 'jn/doc-backslash'
Junio C Hamano committed about 16 years ago
Merge branch 'jn/update-contrib-example-merge'
Junio C Hamano committed about 16 years ago
Merge branch 'jn/merge-renormalize'
Junio C Hamano committed about 16 years ago
Junio C Hamano committed about 16 years ago
Junio C Hamano committed about 16 years ago
builtin/merge_recursive.c: Add an usage string and make use of it.
Thiago Farina committed about 16 years ago
t7406 & t7407: add missing && at end of lines
Jens Lehmann committed about 16 years ago
t7405: cd inside subshell instead of around
Jens Lehmann committed about 16 years ago
t7609-merge-co-error-msgs: test non-fast forward case too.
Matthieu Moy committed about 16 years ago
Move "show_all_errors = 1" to setup_unpack_trees_porcelain()
Matthieu Moy committed about 16 years ago
setup_unpack_trees_porcelain: take the whole options struct as parameter
Matthieu Moy committed about 16 years ago