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

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

diff --combined Documentation/githooks.txt
index 1bb4f92d4d317e16929767066a61c123fee0f280,f4e75b9c90e20bc7d7595f127af4bbdb83036bcb..5d3f45560ea9c29ec382c8772522f06ab5f81f73
--- 1/Documentation/githooks.txt
--- 2/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@@ -127,11 -127,10 +127,10 @@@ help message found in the commented por
  commit-msg
  ~~~~~~~~~~
  
- This hook is invoked by 'git commit', and can be bypassed
- with the `--no-verify` option.  It takes a single parameter, the
- name of the file that holds the proposed commit log message.
- Exiting with a non-zero status causes the 'git commit' to
- abort.
+ This hook is invoked by 'git commit' and 'git merge', and can be
+ bypassed with the `--no-verify` option.  It takes a single parameter,
+ the name of the file that holds the proposed commit log message.
+ Exiting with a non-zero status causes the command to 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
@@@ -369,7 -368,7 +368,7 @@@ them
  
  When enabled, the default 'post-update' hook runs
  'git update-server-info' to keep the information used by dumb
 -transports (e.g., HTTP) up-to-date.  If you are publishing
 +transports (e.g., HTTP) up to date.  If you are publishing
  a Git repository that is accessible via HTTP, you should
  probably enable this hook.