Merge branch 'gp/describe-match-uses-glob-pattern' into maint-1.8.1

Junio C Hamano committed over 13 years ago

Merge branch 'nd/doc-index-format' into maint-1.8.1

Junio C Hamano committed over 13 years ago

Merge branch 'wk/doc-pre-rebase' into maint-1.8.1

Junio C Hamano committed over 13 years ago

Merge branch 'jc/color-diff-doc' into maint-1.8.1

Junio C Hamano committed over 13 years ago

merge-one-file: force content conflict for "both sides added" case

Junio C Hamano committed over 13 years ago

transport.c: help gcc 4.6.3 users by squelching compiler warning

Junio C Hamano committed over 13 years ago

git-merge-one-file: send "ERROR:" messages to stderr

Kevin Bracey committed over 13 years ago

git-merge-one-file: style cleanup

Kevin Bracey committed over 13 years ago

merge-one-file: remove stale comment

Junio C Hamano committed over 13 years ago

match-trees: simplify score_trees() using tree_entry()

René Scharfe committed over 13 years ago

t7600: use test_config to set/unset git config variables

Yann Droneaud committed over 13 years ago

t7502: remove clear_config

Yann Droneaud committed over 13 years ago

t7502: use test_config to set/unset git config variables

Yann Droneaud committed over 13 years ago

t9500: use test_config to set/unset git config variables

Yann Droneaud committed over 13 years ago

t7508: use test_config to set/unset git config variables

Yann Droneaud committed over 13 years ago

t7500: use test_config to set/unset git config variables

Yann Droneaud committed over 13 years ago

t5541: use test_config to set/unset git config variables

Yann Droneaud committed over 13 years ago

t5520: use test_config to set/unset git config variables

Yann Droneaud committed over 13 years ago

t4202: use test_config/test_unconfig to set/unset git config variables

Yann Droneaud committed over 13 years ago

t4034: use test_config/test_unconfig to set/unset git config variables

Yann Droneaud committed over 13 years ago