Merge branch 'maint-1.8.1' into maint

Junio C Hamano committed over 13 years ago

merge-tree: fix typo in merge-tree.c::unresolved

John Keeping committed over 13 years ago

git-commit doc: describe use of multiple `-m` options

Christian Helmuth committed over 13 years ago

git-pull doc: fix grammo ("conflicts" is plural)

Mihai Capotă committed over 13 years ago

Merge branch 'master' of git://git.bogomips.org/git-svn

Junio C Hamano committed over 13 years ago

Merge branch 'rs/archive-zip-raw-compression'

Junio C Hamano committed over 13 years ago

Merge branch 'ap/combine-diff-ignore-whitespace'

Junio C Hamano committed over 13 years ago

checkout: avoid unnecessary match_pathspec calls

Nguyễn Thái Ngọc Duy committed over 13 years ago

git-svn: Support custom tunnel schemes instead of SSH only

Sebastian Schuberth committed over 13 years ago

safe_create_leading_directories: fix race that could give a false negative

Steven Walter committed over 13 years ago

More topics from the second batch for 1.8.3

Junio C Hamano committed over 13 years ago

Merge branch 'jc/reflog-reverse-walk'

Junio C Hamano committed over 13 years ago

Merge branch 'kb/p4merge'

Junio C Hamano committed over 13 years ago

Merge branch 'maint'

Junio C Hamano committed over 13 years ago

More corrections for 1.8.2.1

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 'we/submodule-update-prefix-output' into maint

Junio C Hamano committed over 13 years ago

Merge branch 'jk/mailsplit-maildir-muttsort' into maint

Junio C Hamano committed over 13 years ago

Merge branch 'rs/zip-compresssed-size-with-export-subst' into maint

Junio C Hamano committed over 13 years ago

Merge branch 'jk/utf-8-can-be-spelled-differently' into maint

Junio C Hamano committed over 13 years ago