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 --cc Documentation/githooks.txt
Simple merge