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: don't sanitize remote names in config
  show_stats(): fix stats width calculation
  Documentation: remove {show,whatchanged}.difftree config options
  git-svn: avoid filling up the disk with temp files.
  git cat-file: Fix memory leak in batch mode
  fix git config example syntax
  avoid off-by-one error in run_upload_archive
  GIT-VERSION-GEN: do not fail if a 'HEAD' file exists in the working copy
  commit-tree: lift completely arbitrary limit of 16 parents
  shrink git-shell by avoiding redundant dependencies
  help: check early if we have a command, if not try a documentation topic
  Document the double-dash "rev -- path" disambiguator
  Don't use dash commands (git-foo) in tutorial-2
  test-lib.sh: show git init output when in verbose mode
  GIT 1.5.5.5
  GIT 1.5.4.6
  git-shell: accept "git foo" form
  diff --check: do not discard error status upon seeing a good line
  improve for-each-ref test script
  Add 'git-p4.allowSubmit' to git-p4