From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Sep 2017 02:23:42 +0000 (+0900)
Subject: Merge branch 'sb/merge-commit-msg-hook'
X-Git-Tag: v2.15.0-rc0~31
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d4d262d19e118faf29df842b752144da7c7af02e?ds=inline;hp=--cc

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
---

d4d262d19e118faf29df842b752144da7c7af02e