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: (387 commits)
  gitweb: Add charset info to "raw" output of 'text/plain' blobs
  Strbuf documentation: document most functions
  Documentation/git-mailsplit: Enhanced description of -o option
  Fix "git clone http://$URL" to check out the worktree when asked
  describe: match pattern for lightweight tags too
  t7502: honor SHELL_PATH
  Documentation: git-log cannot use rev-list specific options
  Fix t5516 on cygwin: it does not like double slashes at the beginning of a path
  t7502: tighten loosely written test sequence
  t7502: do not globally unset GIT_COMMITTER_* environment variables
  cat-file --batch: flush stdout also when objects are missing
  GIT v1.5.6-rc1
  commit: drop duplicated parents
  rebase --interactive: Compute upstream SHA1 before switching branches
  Documentation/git-filter-branch.txt: Fix description of --commit-filter
  gitweb: Fix "next" link on bottom of page
  Revert "git.el: Set process-environment instead of invoking env"
  make verify-pack a bit more useful with bad packs
  Git.pm: fix return value of config method
  glossary: improve a few links
  ...