summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-29 11:23:42 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-29 11:23:42 +0900
commitd4d262d19e118faf29df842b752144da7c7af02e (patch)
tree838ced9237391f172b84f664d2b76094cd3b2bd7
parentMerge branch 'jt/fast-export-copy-modify-fix' (diff)
parentDocumentation/githooks: mention merge in commit-msg hook (diff)
downloadtgif-d4d262d19e118faf29df842b752144da7c7af02e.tar.xz
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
-rw-r--r--Documentation/githooks.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 1bb4f92d4d..5d3f45560e 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -127,11 +127,10 @@ help message found in the commented portion of the commit template.
commit-msg
~~~~~~~~~~
-This hook is invoked by 'git commit', and can be bypassed
-with the `--no-verify` option. It takes a single parameter, the
-name of the file that holds the proposed commit log message.
-Exiting with a non-zero status causes the 'git commit' to
-abort.
+This hook is invoked by 'git commit' and 'git merge', and can be
+bypassed with the `--no-verify` option. It takes a single parameter,
+the name of the file that holds the proposed commit log message.
+Exiting with a non-zero status causes the command to abort.
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