Autogenerated HTML docs for v2.34.0-rc1-14-g88d91

22 files changed, 39 insertions, 27 deletions

diff --git a/RelNotes/2.34.0.txt b/RelNotes/2.34.0.txt
index f6d5834c8..7aa14f863 100644
--- a/RelNotes/2.34.0.txt
+++ b/RelNotes/2.34.0.txt
@@ -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/git-commit.html b/git-commit.html
index 12d26b1b7..b4ee74fc8 100644
--- a/git-commit.html
+++ b/git-commit.html
@@ -1099,11 +1099,12 @@ option on the command line.</p></div>
 -n

 </dt>

 <dt class="hdlist1">

---no-verify

+--[no-]verify

 </dt>

 <dd>

 <p>

-        This option bypasses the pre-commit and commit-msg hooks.

+        By default, the pre-commit and commit-msg hooks are run.

+        When any of <code>--no-verify</code> or <code>-n</code> is given, these are bypassed.

         See also <a href="githooks.html">githooks(5)</a>.

 </p>

 </dd>

@@ -1780,7 +1781,7 @@ information.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-07-14 15:10:10 PDT

+ 2021-11-04 13:20:34 PDT

 </div>

 </div>

 </body>

diff --git a/git-commit.txt b/git-commit.txt
index 95fec5f06..6c60bf98f 100644
--- a/git-commit.txt
+++ b/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/git-merge.html b/git-merge.html
index 68acd05ec..1bd8ab3a4 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -979,11 +979,12 @@ option can be used to override --squash.</p></div>
 <div class="paragraph"><p>With --squash, --commit is not allowed, and will fail.</p></div>

 </dd>

 <dt class="hdlist1">

---no-verify

+--[no-]verify

 </dt>

 <dd>

 <p>

-        This option bypasses the pre-merge and commit-msg hooks.

+        By default, the pre-merge and commit-msg hooks are run.

+        When <code>--no-verify</code> is given, these are bypassed.

         See also <a href="githooks.html">githooks(5)</a>.

 </p>

 </dd>

diff --git a/git-pull.html b/git-pull.html
index 889a23d0a..bd5987a82 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1036,11 +1036,12 @@ option can be used to override --squash.</p></div>
 <div class="paragraph"><p>Only useful when merging.</p></div>

 </dd>

 <dt class="hdlist1">

---no-verify

+--[no-]verify

 </dt>

 <dd>

 <p>

-        This option bypasses the pre-merge and commit-msg hooks.

+        By default, the pre-merge and commit-msg hooks are run.

+        When <code>--no-verify</code> is given, these are bypassed.

         See also <a href="githooks.html">githooks(5)</a>.

         Only useful when merging.

 </p>

diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 660892f74..dccf2da69 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -873,7 +873,7 @@ Thanks,
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:29 PDT

+ 2021-11-04 13:21:12 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index f7d5472e2..1b0ec40b5 100644
--- a/howto/keep-canonical-history-correct.html
+++ b/howto/keep-canonical-history-correct.html
@@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:29 PDT

+ 2021-11-04 13:21:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 0d2dbb98c..bf0bd20ca 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:29 PDT

+ 2021-11-04 13:21:12 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 0bb36106e..07f4b1f55 100644
--- a/howto/new-command.html
+++ b/howto/new-command.html
@@ -863,7 +863,7 @@ letter [PATCH 0/n].
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:27 PDT

+ 2021-11-04 13:21:09 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index bd55d1c42..016d5612c 100644
--- a/howto/rebase-from-internal-branch.html
+++ b/howto/rebase-from-internal-branch.html
@@ -895,7 +895,7 @@ the #1' commit.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:29 PDT

+ 2021-11-04 13:21:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 3442849a5..7e57c4f45 100644
--- a/howto/rebuild-from-update-hook.html
+++ b/howto/rebuild-from-update-hook.html
@@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:29 PDT

+ 2021-11-04 13:21:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 203baef18..99f0cd577 100644
--- a/howto/recover-corrupted-blob-object.html
+++ b/howto/recover-corrupted-blob-object.html
@@ -880,7 +880,7 @@ thing.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:29 PDT

+ 2021-11-04 13:21:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index c5717bfac..b39e88d53 100644
--- a/howto/recover-corrupted-object-harder.html
+++ b/howto/recover-corrupted-object-harder.html
@@ -1189,7 +1189,7 @@ int main(int argc, char **argv)
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:29 PDT

+ 2021-11-04 13:21:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index b9ae348c4..835043522 100644
--- a/howto/revert-a-faulty-merge.html
+++ b/howto/revert-a-faulty-merge.html
@@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:29 PDT

+ 2021-11-04 13:21:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 7fe946bea..3e6e7a9c6 100644
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:27 PDT

+ 2021-11-04 13:21:09 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 1597a1658..9083e0ec2 100644
--- a/howto/separating-topic-branches.html
+++ b/howto/separating-topic-branches.html
@@ -841,7 +841,7 @@ o---o"master"</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:29 PDT

+ 2021-11-04 13:21:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index d0744f08e..d88266aee 100644
--- a/howto/setup-git-server-over-http.html
+++ b/howto/setup-git-server-over-http.html
@@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:28 PDT

+ 2021-11-04 13:21:10 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 032e07bb9..493c58627 100644
--- a/howto/update-hook-example.html
+++ b/howto/update-hook-example.html
@@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:28 PDT

+ 2021-11-04 13:21:10 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index fce154fd8..d504ce5dc 100644
--- a/howto/use-git-daemon.html
+++ b/howto/use-git-daemon.html
@@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:28 PDT

+ 2021-11-04 13:21:10 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 7dc21075d..4dbf32b8a 100644
--- a/howto/using-merge-subtree.html
+++ b/howto/using-merge-subtree.html
@@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:27 PDT

+ 2021-11-04 13:21:09 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index 081e16df3..4cfb81248 100644
--- a/howto/using-signed-tag-in-pull-request.html
+++ b/howto/using-signed-tag-in-pull-request.html
@@ -952,7 +952,7 @@ as part of the merge commit.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-11-03 13:49:28 PDT

+ 2021-11-04 13:21:10 PDT

 </div>

 </div>

 </body>

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.