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: (48 commits)
  Update clone/fetch documentation with --depth (shallow clone) option
  Strongly discourage --update-head-ok in fetch-options documentation.
  Documentation: remove master:origin example from pull-fetch-param.txt
  Documentation: update git-pull.txt for new clone behavior
  git-fetch: remove .keep file at the end.
  fail pull/merge early in the middle of conflicted merge
  Update send-pack pipeline documentation.
  git-svn: t/t91??-*: optimize the tests a bit
  git-svn: t/t9100-git-svn-basic: remove old check for NO_SYMLINK
  git-svn: remove svnadmin dependency from the tests
  i18n: do not leak 'encoding' header even when we cheat the conversion.
  Do not merge random set of refs out of wildcarded refs
  Fix formatting for urls section of fetch, pull, and push manpages
  Documentation: update tutorial's discussion of origin
  Documentation: update glossary entry for "origin"
  Documentation: update git-clone.txt for clone's new default behavior
  Docs: update cvs-migration.txt to reflect clone's new default behavior
  send-pack: tell pack-objects to use its internal rev-list.
  send-pack.c: use is_null_sha1()
  Update documentation for update hook.
  ...