[RFC/PATCH 3/3] revert/cherry-pick --no-verify: Update documentation
- From
Johan Herland <johan@herland.net>
- Date
- Sep 3, 2014, 14:03 UTC
- Message-ID
- <1409753034-9459-4-git-send-email-johan@herland.net>
- 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