diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2021-11-10 08:55:14 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2021-11-10 08:55:14 +0800 |
| commit | 3a6160031b54c2e1174b1f990c7393ef8cb39d3d (patch) | |
| tree | 9410f60fd52d173303d6faf718f0fa3f579617e8 /Documentation/merge-options.txt | |
| parent | l10n: pl: 2.34.0 round 2 (diff) | |
| parent | Git 2.34-rc2 (diff) | |
| download | tgif-3a6160031b54c2e1174b1f990c7393ef8cb39d3d.tar.xz | |
Merge branch 'master' of github.com:git/git
* 'master' of github.com:git/git:
Git 2.34-rc2
parse-options.[ch]: revert use of "enum" for parse_options()
t/lib-git.sh: fix ACL-related permissions failure
A few fixes before -rc2
async_die_is_recursing: work around GCC v11.x issue on Fedora
Document positive variant of commit and merge option "--no-verify"
pull: honor --no-verify and do not call the commit-msg hook
http-backend: remove a duplicated code branch
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. |