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: (25 commits)
  gitweb/README: Document $base_url
  Documentation: git submodule: add missing options to synopsis
  git-merge-base/git-show-branch --merge-base: Documentation and test
  git-merge-base/git-show-branch: Cleanup documentation and usage
  t6010-merge-base.sh: Depict the octopus test graph
  Better usage string for reflog.
  hg-to-git: don't import the unused popen2 module
  send-email: remove debug trace
  gitweb: fix 'Use of uninitialized value' error in href()
  technical-docs: document tree-walking API
  config: Keep inner whitespace verbatim
  git init: optionally allow a directory argument
  show: add space between multiple items
  show: suppress extra newline when showing annotated tag
  pull: support rebased upstream + fetch + pull --rebase
  t5520-pull: Test for rebased upstream + fetch + pull --rebase
  init-db: migrate to parse-options
  apply: notice creation/removal patches produced by GNU diff
  prune-packed: migrate to parse-options
  verify-pack: migrate to parse-options
  ...