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:
  Use GIT_OBJECT_DIR for temporary files of pack-objects
  Fix minor documentation errors
  t7300: Basic tests for git-clean
  dir.c: Omit non-excluded directories with dir->show_ignored
  Added a reference to git-add in the documentation for git-update-index
  Document git add -u introduced earlier.
  Documentation: don't reference non-existent 'git-cvsapplycommit'
  user-manual: stop deprecating the manual
  user-manual: miscellaneous editing
  user-manual: fix .gitconfig editing examples
  user-manual: clean up fast-forward and dangling-objects sections
  user-manual: add section ID's
  user-manual: more discussion of detached heads, fix typos
  git-gui: Allow spaces in path to 'wish'
  git-gui: Correctly handle UTF-8 encoded commit messages
  gitk: Allow user to choose whether to see the diff, old file, or new file