diff options
| author | Alex Riesen <raa.lkml@gmail.com> | 2021-10-29 15:45:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-29 11:22:56 -0700 |
| commit | fa21296b58e5b2c865a3974e5f03b65f4026c510 (patch) | |
| tree | 5a7bd641c9192cec6311a242012060a807f87c6f /Documentation/merge-options.txt | |
| parent | e9e5ba39a78c8f5057262d49e261b42a8660d5b9 (diff) | |
| download | git-fa21296b58e5b2c865a3974e5f03b65f4026c510.tar.gz | |
Document positive variant of commit and merge option "--no-verify"
This documents "--verify" option of the commands. It can be used to re-enable
the hooks disabled by an earlier "--no-verify" in command-line.
Signed-off-by: Alexander Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 61ec157c2f..d8f7cd7ca0 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -132,8 +132,9 @@ ifdef::git-pull[] Only useful when merging. endif::git-pull[] ---no-verify:: - This option bypasses the pre-merge and commit-msg hooks. +--[no-]verify:: + By default, the pre-merge and commit-msg hooks are run. + When `--no-verify` is given, these are bypassed. See also linkgit:githooks[5]. ifdef::git-pull[] Only useful when merging. |