Merge branch 'master' of git://git.kernel.org/pub/scm/git/git

Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git: (111 commits)
  Revert "mailinfo: Remove only one set of square brackets"
  Fix extraneous lstat's in 'git checkout -f'
  Improve on the 'invalid object' error message at commit time
  Make 'git show' more useful
  bash: add '--merges' to common 'git log' options
  Document 'git (rev-list|log) --merges'
  gitweb: update Git homepage URL
  git svn: allow uppercase UUIDs from SVN
  git-svn: Fix branch detection when repository root is inaccessible
  git-svn: Always duplicate paths returned from get_log
  quickfetch(): Prevent overflow of the rev-list command line
  Makefile: update IRIX64 section
  Makefile: add section for SGI IRIX 6.5
  Makefile: add NEEDS_LIBGEN to optionally add -lgen to compile arguments
  git-compat-util.h: adjust for SGI IRIX 6.5
  unpack-trees.c: work around run-time array initialization flaw on IRIX 6.5
  Makefile: keep "git" when bindir is execdir
  Make index preloading check the whole path to the file
  Export thread-safe version of 'has_symlink_leading_path()'
  Prepare symlink caching for thread-safety
  ...