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: (109 commits)
  allow git-am to run in a subdirectory
  rename: warn user when we have turned off rename detection
  Add test for git rebase --abort
  t6024: move "git reset" to prepare for a test inside the test itself
  gc: Add --quiet option
  Documentation cherry-pick: Fix cut-and-paste error
  git.el: find the git-status buffer whatever its name is
  clone: support cloning full bundles
  Update draft release notes for 1.5.5
  use build-time SHELL_PATH in test scripts
  Write index file on any checkout of files
  rev-list: add --branches, --tags and --remotes
  Improve t6029 to check the real "subtree" case
  Use diff_tree() directly in making cover letter
  Always use the current connection's remote ref list in git protocol
  tests: introduce test_must_fail
  Fix builtin checkout crashing when given an invalid path
  templates/Makefile: don't depend on local umask setting
  Correct name of diff_flush() in API documentation
  Start preparing for 1.5.4.4
  ...