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>
Stefan Beller committed
Sep 21, 2017 at 13:29 UTC
ce82eddf1243687477ce8a88c21739a02416545a
1 file changed
+4
-5
Documentation/githooks.txt
+4
-5
@@ -127,11 +127,10 @@ help message found in the commented portion of the commit template.
127
commit-msg
128
~~~~~~~~~~
129
130
-This hook is invoked by 'git commit', and can be bypassed
131
-with the `--no-verify` option. It takes a single parameter, the
132
-name of the file that holds the proposed commit log message.
133
-Exiting with a non-zero status causes the 'git commit' to
134
-abort.
130
+This hook is invoked by 'git commit' and 'git merge', and can be
131
+bypassed with the `--no-verify` option. It takes a single parameter,
132
+the name of the file that holds the proposed commit log message.
133
+Exiting with a non-zero status causes the command to abort.
134
135
The hook is allowed to edit the message file in place, and can be used
136
to normalize the message into some project standard format. It