diff options
Diffstat (limited to 'Documentation/githooks.txt')
| -rw-r--r-- | Documentation/githooks.txt | 20 |
1 files changed, 10 insertions, 10 deletions
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 |