Merge branch 'master' of git://git./git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (29 commits)
Do not use h_errno after connect(2): the function does not set it
Documentation: update "stale" links for 1.5.2.2
git-svn: avoid string eval for defining functions
Fix pushing to a pattern with no dst
GIT 1.5.2.2
Documentation: adjust to AsciiDoc 8
Avoid diff cost on "git log -z"
git-branch --track: fix tracking branch computation.
$EMAIL is a last resort fallback, as it's system-wide.
merge-recursive: refuse to merge binary files
Move buffer_is_binary() to xdiff-interface.h
Add a local implementation of hstrerror for the system which do not have it
gitmodules(5): remove leading period from synopsis
Generated spec file to be ignored is named git.spec and not git-core.spec
cvsserver: Actually implement --export-all
cvsserver: Let --base-path and pserver get along just fine
Add gitmodules(5)
git-submodule: give submodules proper names
Rename sections from "module" to "submodule" in .gitmodules
git-submodule: remember to checkout after clone
...