Merge branch 'sb/merge-commit-msg-hook'

As "git commit" to conclude a conflicted "git merge" honors the
commit-msg hook, "git merge" that records a merge commit that
cleanly auto-merges should, but it didn't.
* sb/merge-commit-msg-hook (2017-09-22) 1 commit
(merged to 'next' on 2017-09-25 at 096e0502a8)
+ Documentation/githooks: mention merge in commit-msg hook

Add documentation for a topic that has recently graduated to the
'master' branch.

* sb/merge-commit-msg-hook:
  Documentation/githooks: mention merge in commit-msg hook

Documentation/githooks.txt

@@ -127,11 +127,10 @@ help message found in the commented portion of the commit template.
 commit-msg
 ~~~~~~~~~~
 
-This hook is invoked by 'git commit', and can be bypassed
+This hook is invoked by 'git commit' and 'git merge', and can be
-with the `--no-verify` option.  It takes a single parameter, the
+bypassed with the `--no-verify` option.  It takes a single parameter,
-name of the file that holds the proposed commit log message.
+the name of the file that holds the proposed commit log message.
-Exiting with a non-zero status causes the 'git commit' to
+Exiting with a non-zero status causes the command to abort.
-abort.
 
 The hook is allowed to edit the message file in place, and can be used
 to normalize the message into some project standard format. It