diff options
| author | Johan Herland <johan@herland.net> | 2014-09-03 16:03:54 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-03 14:18:32 -0700 |
| commit | 9a9d94756a5777248a5e9e6252dbd30c412d255b (patch) | |
| tree | 2ef1d7161ded6a5900df0f02460aebf51d4ef2b7 | |
| parent | 9127e0a9cef02707c78f775088ce09785e510a1c (diff) | |
| download | git-jh/cherry-pick-no-verify.tar.gz | |
revert/cherry-pick --no-verify: document the new optionjh/cherry-pick-no-verify
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-cherry-pick.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-revert.txt | 4 | ||||
| -rw-r--r-- | 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 1c03c792b0..9978d13a83 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:: + Bypass 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 cceb5f2f7f..b03bb84e08 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:: + Bypass 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 d954bf6ba8..9c3bf6c4b5 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 |