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:
  gitweb: Fix split patches output (e.g. file to symlink)
  Revert "gitweb: There can be empty patches (in git_patchset_body)"
  gitweb: Fix errors in git_patchset_body for empty patches
  gitweb: Fix error in "rename to"/"copy to" git diff header output
  gitweb: Fix error in git_patchest_body for file creation/deletion patch
  git-svn: fix show-ignore
  Documentation: tutorial editing
  Documentation/git-svn: clarify dcommit, rebase vs pull/merge
  git-svnimport: clean svn path when accessing SVN repo
  git-svnimport: support for incremental import
  git.el: Avoid setting font lock keywords before entering log-edit mode.
  instaweb: Nicer error message when the http daemon isn't found
  git.el: Don't use --info-only when resolving a file.
  git-clean: Fix the -q option.
  Print a more accurate error message when we fail to create a lock file.
  Describe git-clone's actual behavior in the summary
  Set default "tar" umask to 002 and owner.group to root.root
  Fix timestamp for test-tick
  builtin-prune: memory diet.