Merge branch 'sb/merge-commit-msg-hook'
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Sep 2017 02:23:42 +0000 (11:23 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Sep 2017 02:23:42 +0000 (11:23 +0900)
commitd4d262d19e118faf29df842b752144da7c7af02e
tree838ced9237391f172b84f664d2b76094cd3b2bd7
parent8096e1d385660c159d9d47e69b2be63cf22e4f31
parentce82eddf1243687477ce8a88c21739a02416545a
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