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: (38 commits)
  bash: Support internal revlist options better.
  bash: Support unique completion when possible.
  bash: Support unique completion on git-config.
  bash: Classify more commends out of completion.
  bash: Add space after unique command name is completed.
  bash: Complete long options to git-add.
  bash: Classify cat-file and reflog as plumbing.
  bash: Remove short option completions for branch/checkout/diff.
  Default GIT_MERGE_VERBOSITY to 5 during tests.
  Keep untracked files not involved in a merge.
  Assorted typo fixes
  Cleanup subcommand documentation for git-remote.
  git-config --rename-section could rename wrong section
  combine-diff: special case --unified=0
  Why is it bad to rewind a branch that has already been pushed out?
  honor GIT_REFLOG_ACTION in git-commit
  fix reflog entries for "git-branch"
  core-tutorial: http reference link fix
  Tutorial-2: Adjust git-status output to recent reality.
  Tutorial: fix asciidoc formatting of "git add" section.
  ...