From: Stefan Beller <sbeller@google.com>
To: kaarticsivaraam91196@gmail.com
Cc: git@vger.kernel.org, gitster@pobox.com, sbeller@google.com
Subject: [PATCH] Documentation/githooks: mention merge in commit-msg hook
Date: Thu, 21 Sep 2017 13:29:54 -0700 [thread overview]
Message-ID: <20170921202954.7854-1-sbeller@google.com> (raw)
In-Reply-To: <1505542931.27598.4.camel@gmail.com>
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>
---
Documentation/githooks.txt | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 623ed1a138..f4e75b9c90 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
--
2.14.0.rc0.3.g6c2e499285
next prev parent reply other threads:[~2017-09-21 20:30 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-05 21:01 [PATCH] builtin/merge: honor commit-msg hook for merges Stefan Beller
2017-09-05 21:38 ` Junio C Hamano
2017-09-05 23:08 ` [PATCH] parse-options: warn developers on negated options Stefan Beller
2017-09-06 1:52 ` Junio C Hamano
2017-09-06 3:16 ` Junio C Hamano
2017-09-06 21:36 ` Stefan Beller
2017-09-06 23:41 ` Junio C Hamano
2017-09-05 23:29 ` [PATCHv2] builtin/merge: honor commit-msg hook for merges Stefan Beller
2017-09-06 1:57 ` Junio C Hamano
2017-09-06 22:11 ` Stefan Beller
2017-09-06 23:43 ` Junio C Hamano
2017-09-07 22:04 ` [PATCHv3] " Stefan Beller
2017-09-08 1:13 ` Junio C Hamano
2017-09-11 17:12 ` Stefan Beller
2017-09-16 6:22 ` Kaartic Sivaraam
2017-09-20 19:55 ` Stefan Beller
2017-09-21 1:10 ` Junio C Hamano
2017-09-21 20:29 ` Stefan Beller [this message]
2017-09-22 1:58 ` [PATCH] Documentation/githooks: mention merge in commit-msg hook Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170921202954.7854-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kaarticsivaraam91196@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).