diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-11-04 13:22:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-04 13:22:31 -0700 |
| commit | 5dbbd5d18acacd0b16ea751a14f209ff5d231eb6 (patch) | |
| tree | 351ad95dbfa4aa1c1aa4d1ba1da5f39db1aa2fb9 /merge-options.txt | |
| parent | 9e5ea002d7611df71e40a292f873d9ed30ec578f (diff) | |
| download | git-htmldocs-5dbbd5d18acacd0b16ea751a14f209ff5d231eb6.tar.gz | |
Autogenerated HTML docs for v2.34.0-rc1-14-g88d91
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/merge-options.txt b/merge-options.txt index 61ec157c2..d8f7cd7ca 100644 --- a/merge-options.txt +++ b/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. |