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: (71 commits)
  RelNotes: the third batch
  Do not use SHELL_PATH from build system in prepare_shell_cmd on Windows
  RelNotes: the second batch of topics graduated to 'master'
  RelNotes: the first batch of topics graduated to 'master'
  merge overwrites unstaged changes in renamed file
  Fix httpd tests that broke when non-ff push advice changed
  Kick off post 1.7.10 cycle
  gitweb: Fix unintended "--no-merges" for regular Atom feed
  unpack-trees: plug minor memory leak
  unpack-trees: don't perform any index operation if we're not merging
  Avoid bug in Solaris xpg4/sed as used in submodule
  run-command: treat inaccessible directories as ENOENT
  compat/mingw.[ch]: Change return type of exec functions to int
  push: error out when the "upstream" semantics does not make sense
  add--interactive: ignore unmerged entries in patch mode
  Use SHELL_PATH from build system in run_command.c:prepare_shell_cmd
  Documentation/git-commit: rephrase the "initial-ness" of templates
  git-commit.txt: clarify -t requires editing message
  commit: rephrase the error when user did not touch templated log message
  commit: do not trigger bogus "has templated message edited" check
  ...