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

Merge branch 'mg/doc-bundle'

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

Sync with 1.7.2.3

Junio C Hamano committed about 16 years ago

Git 1.7.2.3

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

Move set_porcelain_error_msgs to unpack-trees.c and rename it

Matthieu Moy committed about 16 years ago

Prepare for 1.7.3

Junio C Hamano committed about 16 years ago

Merge branch 'maint'

Junio C Hamano committed about 16 years ago

Prepare for 1.7.2.3

Junio C Hamano committed about 16 years ago

Merge branch 'gp/pack-refs-remove-empty-dirs' into maint

Junio C Hamano committed about 16 years ago

Merge branch 'sg/rerere-gc-old-still-used' into maint

Junio C Hamano committed about 16 years ago