Merge branch 'ap/maint-diff-rename-avoid-overlap'

Junio C Hamano committed over 13 years ago

Merge branch 'jl/submodule-deinit'

Junio C Hamano committed over 13 years ago

Merge branch 'jc/describe'

Junio C Hamano committed over 13 years ago

Merge branch 'pe/pull-rebase-v-q'

Junio C Hamano committed over 13 years ago

Merge branch 'maint'

Junio C Hamano committed over 13 years ago

Start preparing for 1.8.2.1

Junio C Hamano committed over 13 years ago

Merge branch 'jk/graph-c-expose-symbols-for-cgit' into maint

Junio C Hamano committed over 13 years ago

Merge branch 'maint-1.8.1' into maint

Junio C Hamano committed over 13 years ago

Merge branch 'lf/bundle-verify-list-prereqs' into maint-1.8.1

Junio C Hamano committed over 13 years ago

Merge branch 'tk/doc-filter-branch' into maint-1.8.1

Junio C Hamano committed over 13 years ago

Merge branch 'dm/ni-maxhost-may-be-missing' into maint-1.8.1

Junio C Hamano committed over 13 years ago

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