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 | |
| 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')
| -rw-r--r-- | Documentation/RelNotes/2.34.0.txt | 9 | ||||
| -rw-r--r-- | Documentation/git-commit.txt | 5 | ||||
| -rw-r--r-- | Documentation/merge-options.txt | 5 |
3 files changed, 14 insertions, 5 deletions
diff --git a/Documentation/RelNotes/2.34.0.txt b/Documentation/RelNotes/2.34.0.txt index f6d5834c8d..effab2ea4b 100644 --- a/Documentation/RelNotes/2.34.0.txt +++ b/Documentation/RelNotes/2.34.0.txt @@ -383,7 +383,7 @@ Fixes since v2.33 compression level for both zip and tar.gz format. (merge c4b208c309 bs/archive-doc-compression-level later to maint). - * Drop "git sparse-index" from the list of common commands. + * Drop "git sparse-checkout" from the list of common commands. (merge 6a9a50a8af sg/sparse-index-not-that-common-a-command later to maint). * "git branch -c/-m new old" was not described to copy config, which @@ -401,6 +401,13 @@ Fixes since v2.33 object replacement. (merge 095d112f8c ab/ignore-replace-while-working-on-commit-graph later to maint). + * "git pull --no-verify" did not affect the underlying "git merge". + (merge 47bfdfb3fd ar/fix-git-pull-no-verify later to maint). + + * One CI task based on Fedora image noticed a not-quite-kosher + consturct recently, which has been corrected. + (merge 4b540cf913 vd/pthread-setspecific-g11-fix later to maint). + * Other code cleanup, docfix, build fix, etc. (merge f188160be9 ab/bundle-remove-verbose-option later to maint). (merge 8c6b4332b4 rs/close-pack-leakfix later to maint). diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 95fec5f069..6c60bf98f9 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -212,8 +212,9 @@ include::signoff-option.txt[] each trailer would appear, and other details. -n:: ---no-verify:: - This option bypasses the pre-commit and commit-msg hooks. +--[no-]verify:: + By default, the pre-commit and commit-msg hooks are run. + When any of `--no-verify` or `-n` is given, these are bypassed. See also linkgit:githooks[5]. --allow-empty:: 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. |