From: Johan Herland <johan@herland.net>
To: git@vger.kernel.org
Cc: "Lars Gullik Bjønnes" <larsbj@gullik.org>,
"Junio C Hamano" <gitster@pobox.com>,
"Neil Horman" <nhorman@tuxdriver.com>,
"Ramkumar Ramachandra" <artagnon@gmail.com>,
"Johan Herland" <johan@herland.net>
Subject: [RFC/PATCH 3/3] revert/cherry-pick --no-verify: Update documentation
Date: Wed, 3 Sep 2014 16:03:54 +0200 [thread overview]
Message-ID: <1409753034-9459-4-git-send-email-johan@herland.net> (raw)
In-Reply-To: <1409753034-9459-1-git-send-email-johan@herland.net>
Add --no-verify to the revert and cherry-pick man pages. Also mention
revert and cherry-pick in the corresponding documentation for the
pre-commit and commit-msg hooks.
Signed-off-by: Johan Herland <johan@herland.net>
---
Documentation/git-cherry-pick.txt | 4 ++++
Documentation/git-revert.txt | 4 ++++
Documentation/githooks.txt | 20 ++++++++++----------
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 1c03c79..f56818f 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -97,6 +97,10 @@ OPTIONS
This is useful when cherry-picking more than one commits'
effect to your index in a row.
+--no-verify::
+ This option bypasses the pre-commit and commit-msg hooks.
+ See also linkgit:githooks[5].
+
-s::
--signoff::
Add Signed-off-by line at the end of the commit message.
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index cceb5f2..c9fb148 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -80,6 +80,10 @@ more details.
This is useful when reverting more than one commits'
effect to your index in a row.
+--no-verify::
+ This option bypasses the pre-commit and commit-msg hooks.
+ See also linkgit:githooks[5].
+
-S[<key-id>]::
--gpg-sign[=<key-id>]::
GPG-sign commits.
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index d954bf6..9c3bf6c 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -72,11 +72,11 @@ the outcome of 'git am'.
pre-commit
~~~~~~~~~~
-This hook is invoked by 'git commit', and can be bypassed
-with `--no-verify` option. It takes no parameter, and is
-invoked before obtaining the proposed commit log message and
-making a commit. Exiting with non-zero status from this script
-causes the 'git commit' to abort.
+This hook is invoked by 'git commit' (including 'git revert' and
+'git cherry-pick'), and can be bypassed with `--no-verify` option.
+It takes no parameter, and is invoked before obtaining the proposed
+commit log message and making a commit. Exiting with non-zero
+status from this script causes the 'git commit' to abort.
The default 'pre-commit' hook, when enabled, catches introduction
of lines with trailing whitespaces and aborts the commit when
@@ -114,11 +114,11 @@ out the `Conflicts:` part of a merge's commit message.
commit-msg
~~~~~~~~~~
-This hook is invoked by 'git commit', and can be bypassed
-with `--no-verify` option. It takes a single parameter, the
-name of the file that holds the proposed commit log message.
-Exiting with non-zero status causes the 'git commit' to
-abort.
+This hook is invoked by 'git commit' (including 'git revert'
+and 'git cherry-pick'), and can be bypassed with `--no-verify`
+option. It takes a single parameter, the name of the file that
+holds the proposed commit log message. Exiting with non-zero
+status causes the 'git commit' 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
--
2.0.0.rc4.501.gdaf83ca
next prev parent reply other threads:[~2014-09-03 14:13 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-03 14:03 [RFC/PATCH 0/3] Teach revert/cherry-pick the --no-verify option Johan Herland
2014-09-03 14:03 ` [RFC/PATCH 1/3] t7503/4: Add failing testcases for revert/cherry-pick --no-verify Johan Herland
2014-09-03 19:28 ` Junio C Hamano
2014-09-03 14:03 ` [RFC/PATCH 2/3] revert/cherry-pick: Add --no-verify option, and pass it on to commit Johan Herland
2014-09-03 19:32 ` Junio C Hamano
2014-09-03 19:42 ` [PATCH] parse-options: detect attempt to add a duplicate short option name Junio C Hamano
2014-09-03 20:29 ` René Scharfe
2014-09-03 21:05 ` Junio C Hamano
2014-09-03 21:46 ` René Scharfe
2014-09-03 22:16 ` Junio C Hamano
2014-09-04 6:13 ` René Scharfe
2014-09-04 17:24 ` Junio C Hamano
2014-09-04 18:07 ` Junio C Hamano
2014-09-03 21:46 ` Jonathan Nieder
2014-09-03 21:58 ` Jonathan Nieder
2014-09-04 8:34 ` [RFC/PATCH 2/3] revert/cherry-pick: Add --no-verify option, and pass it on to commit Johan Herland
2014-09-03 14:03 ` Johan Herland [this message]
2014-09-03 19:21 ` [RFC/PATCH 0/3] Teach revert/cherry-pick the --no-verify option Junio C Hamano
2014-09-05 21:05 ` Fabian Ruch
2014-09-08 15:13 ` Johan Herland
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409753034-9459-4-git-send-email-johan@herland.net \
--to=johan@herland.net \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=larsbj@gullik.org \
--cc=nhorman@tuxdriver.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.
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 NNTP newsgroup(s).