mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation/githooks: mention merge in commit-msg hook

Browse Source 
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>
This commit is contained in:
Stefan Beller
2017-09-21 13:29:54 -07:00
committed by Junio C Hamano
parent f8b863598c
commit ce82eddf12
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/githooks.txt
View File

@ -127,11 +127,10 @@ help message found in the commented portion of the commit template.
commit-msg commit-msg
~~~~~~~~~~ ~~~~~~~~~~
This hook is invoked by 'git commit', and can be bypassed This hook is invoked by 'git commit' and 'git merge', and can be
with the `--no-verify` option. It takes a single parameter, the bypassed with the `--no-verify` option. It takes a single parameter,
name of the file that holds the proposed commit log message. the name of the file that holds the proposed commit log message.
Exiting with a non-zero status causes the 'git commit' to Exiting with a non-zero status causes the command to abort.
abort.
The hook is allowed to edit the message file in place, and can be used The hook is allowed to edit the message file in place, and can be used
to normalize the message into some project standard format. It to normalize the message into some project standard format. It