Merge branch 'master' of git://git./git/git
* 'master' of git://git.kernel.org/pub/scm/git/git:
GIT 1.5.1-rc3
Update main git.html page to point at 1.5.0.6 documentation
GIT 1.5.0.6
commit: fix pretty-printing of messages with "\nencoding "
t4118: be nice to non-GNU sed
t/t6006: add tests for a slightly more complex commit messages
Fix "--pretty=format:" encoding item
Fix "--pretty=format:" for parent related items.
http-fetch: remove path_len from struct alt_base, it was computed but never used
http-fetch: don't use double-slash as directory separator in URLs
git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly
Add some basic tests of rev-list --pretty=format