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:
  git-svn: reduce stat() calls for a backwards compatibility check
  git-svn: test for creating new directories over svn://
  git-svn: cleanup: factor out longest_common_path() function
  gitview: run blame with -C -C
  gitview: Fix the blame interface.
  More static
  -Wold-style-definition fix
  Makefile: allow generating git.o for debugging purposes
  Makefile: common-cmds.h depends on generate-cmdlist.sh script
  refactor dir_add_name
  git-remote show: Also shorten non-fast-forward refs in the 'push' listing
  gitweb: change filename/directory name of snapshots
  Don't dereference a strdup-returned NULL
  git-blame -w: ignore whitespace
  git-blame: do not indent with spaces.
  Use git-tag in git-cvsimport
  cvsimport: add <remote>/HEAD reference in separate remotes more
  cvsimport: update documentation to include separate remotes option
  cvsimport: add support for new style remote layout