Documentation/githooks: mention merge in commit-msg hook
authorStefan Beller <sbeller@google.com>
Thu, 21 Sep 2017 20:29:54 +0000 (13:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Sep 2017 01:58:45 +0000 (10:58 +0900)
commitce82eddf1243687477ce8a88c21739a02416545a
treecf27b85a8bc8c320b976c17695732497de623ce1
parentf8b863598c991a5441d97e5dc59af8968ea37e37
Documentation/githooks: mention merge in commit-msg hook

The commit-msg hook is invoked by both commit and merge now.

Reported-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/githooks.txt