Autogenerated HTML docs for v2.33.0-rc0

26 files changed, 83 insertions, 55 deletions

diff --git a/RelNotes/2.33.0.txt b/RelNotes/2.33.0.txt
index 94b75f4b6..7960c4f7a 100644
--- a/RelNotes/2.33.0.txt
+++ b/RelNotes/2.33.0.txt
@@ -93,6 +93,11 @@ Performance, Internal Implementation, Development Support etc.
  * "TEST_OUTPUT_DIRECTORY=there make test" failed to work, which has
    been corrected.
 
+ * "git bundle" gained more test coverage.
+
+ * "git read-tree" had a codepath where blobs are fetched one-by-one
+   from the promisor remote, which has been corrected to fetch in bulk.
+
 
 Fixes since v2.32
 -----------------
@@ -223,6 +228,15 @@ Fixes since v2.32
    which has been corrected.
    (merge 88617d11f9 tb/reverse-midx later to maint).
 
+ * CI update.
+   (merge a066a90db6 js/ci-check-whitespace-updates later to maint).
+
+ * Documentation fix for "git pull --rebase=no".
+   (merge d3236becec fc/pull-no-rebase-merges-theirs-into-ours later to maint).
+
+ * A race between repacking and using pack bitmaps has been corrected.
+   (merge dc1daacdcc jk/check-pack-valid-before-opening-bitmap later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge bfe35a6165 ah/doc-describe later to maint).
    (merge f302c1e4aa jc/clarify-revision-range later to maint).
@@ -261,3 +275,6 @@ Fixes since v2.32
    (merge 8232a0ff48 dl/packet-read-response-end-fix later to maint).
    (merge eb448631fb dl/diff-merge-base later to maint).
    (merge c510928a25 hn/refs-debug-empty-prefix later to maint).
+   (merge ddcb189d9d tb/bitmap-type-filter-comment-fix later to maint).
+   (merge 878b399734 pb/submodule-recurse-doc later to maint).
+   (merge 734283855f jk/config-env-doc later to maint).
diff --git a/SubmittingPatches.html b/SubmittingPatches.html
index 8642c417a..c61259e62 100644
--- a/SubmittingPatches.html
+++ b/SubmittingPatches.html
@@ -1395,7 +1395,7 @@ this problem around.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-07-19 14:01:20 PDT

+ 2021-08-02 15:42:09 PDT

 </div>

 </div>

 </body>

diff --git a/git-bisect-lk2009.html b/git-bisect-lk2009.html
index 109e48b5a..f7f9901ef 100644
--- a/git-bisect-lk2009.html
+++ b/git-bisect-lk2009.html
@@ -1983,7 +1983,7 @@ author to given a talk and for publishing this paper.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-10-10 00:47:57 JST

+ 2020-10-09 08:47:57 PDT

 </div>

 </div>

 </body>

diff --git a/git-config.html b/git-config.html
index 7bb8e5c8e..46df82af4 100644
--- a/git-config.html
+++ b/git-config.html
@@ -840,7 +840,7 @@ you try to use an invalid regexp (ret=6).
 </div>

 </div>

 <div class="sect1">

-<h2 id="_options">OPTIONS</h2>

+<h2 id="OPTIONS">OPTIONS</h2>

 <div class="sectionbody">

 <div class="dlist"><dl>

 <dt class="hdlist1">

@@ -962,8 +962,12 @@ from all available files.</p></div>
 </dt>

 <dd>

 <p>

-        Use the given config file instead of the one specified by GIT_CONFIG.

+        For writing options: write to the specified file rather than the

+        repository <code>.git/config</code>.

 </p>

+<div class="paragraph"><p>For reading options: read only from the specified file rather than from all

+available files.</p></div>

+<div class="paragraph"><p>See also <a href="#FILES">[FILES]</a>.</p></div>

 </dd>

 <dt class="hdlist1">

 --blob blob

@@ -1300,11 +1304,9 @@ command by using the <code>-c</code> option. See <a href="git.html">git(1)</a> f
 <div class="paragraph"><p>All writing options will per default write to the repository specific

 configuration file. Note that this also affects options like <code>--replace-all</code>

 and <code>--unset</code>. <strong><em>git config</em> will only ever change one file at a time</strong>.</p></div>

-<div class="paragraph"><p>You can override these rules either by command-line options or by environment

-variables. The <code>--global</code>, <code>--system</code> and <code>--worktree</code> options will limit

-the file used to the global, system-wide or per-worktree file respectively.

-The <code>GIT_CONFIG</code> environment variable has a similar effect, but you

-can specify any filename you want.</p></div>

+<div class="paragraph"><p>You can override these rules using the <code>--global</code>, <code>--system</code>,

+<code>--local</code>, <code>--worktree</code>, and <code>--file</code> command-line options; see

+<a href="#OPTIONS">[OPTIONS]</a> above.</p></div>

 </div>

 </div>

 <div class="sect1">

@@ -1312,16 +1314,6 @@ can specify any filename you want.</p></div>
 <div class="sectionbody">

 <div class="dlist"><dl>

 <dt class="hdlist1">

-GIT_CONFIG

-</dt>

-<dd>

-<p>

-        Take the configuration from the given file instead of .git/config.

-        Using the "--global" option forces this to ~/.gitconfig. Using the

-        "--system" option forces this to $(prefix)/etc/gitconfig.

-</p>

-</dd>

-<dt class="hdlist1">

 GIT_CONFIG_GLOBAL

 </dt>

 <dt class="hdlist1">

@@ -1369,6 +1361,18 @@ GIT_CONFIG_VALUE_&lt;n&gt;
 with a common configuration but cannot depend on a configuration file,

 for example when writing scripts.</p></div>

 </dd>

+<dt class="hdlist1">

+GIT_CONFIG

+</dt>

+<dd>

+<p>

+        If no <code>--file</code> option is provided to <code>git config</code>, use the file

+        given by <code>GIT_CONFIG</code> as if it were provided via <code>--file</code>. This

+        variable has no effect on other Git commands, and is mostly for

+        historical compatibility; there is generally no reason to use it

+        instead of the <code>--file</code> option.

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -9696,8 +9700,9 @@ submodule.recurse
 </dt>

 <dd>

 <p>

-        Specifies if commands recurse into submodules by default. This

-        applies to all commands that have a <code>--recurse-submodules</code> option

+        A boolean indicating if commands should enable the <code>--recurse-submodules</code>

+        option by default.

+        Applies to all commands that support this option

         (<code>checkout</code>, <code>fetch</code>, <code>grep</code>, <code>pull</code>, <code>push</code>, <code>read-tree</code>, <code>reset</code>,

         <code>restore</code> and <code>switch</code>) except <code>clone</code> and <code>ls-files</code>.

         Defaults to false.

@@ -10396,7 +10401,7 @@ looks like</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-05-06 21:16:48 PDT

+ 2021-08-02 15:41:53 PDT

 </div>

 </div>

 </body>

diff --git a/git-config.txt b/git-config.txt
index 5cddadafd..2dc4bae6d 100644
--- a/git-config.txt
+++ b/git-config.txt
@@ -71,6 +71,7 @@ codes are:
 
 On success, the command returns the exit code 0.
 
+[[OPTIONS]]
 OPTIONS
 -------
 
@@ -143,7 +144,13 @@ See also <<FILES>>.
 
 -f config-file::
 --file config-file::
-	Use the given config file instead of the one specified by GIT_CONFIG.
+	For writing options: write to the specified file rather than the
+	repository `.git/config`.
++
+For reading options: read only from the specified file rather than from all
+available files.
++
+See also <<FILES>>.
 
 --blob blob::
 	Similar to `--file` but use the given blob instead of a file. E.g.
@@ -325,21 +332,14 @@ All writing options will per default write to the repository specific
 configuration file. Note that this also affects options like `--replace-all`
 and `--unset`. *'git config' will only ever change one file at a time*.
 
-You can override these rules either by command-line options or by environment
-variables. The `--global`, `--system` and `--worktree` options will limit
-the file used to the global, system-wide or per-worktree file respectively.
-The `GIT_CONFIG` environment variable has a similar effect, but you
-can specify any filename you want.
+You can override these rules using the `--global`, `--system`,
+`--local`, `--worktree`, and `--file` command-line options; see
+<<OPTIONS>> above.
 
 
 ENVIRONMENT
 -----------
 
-GIT_CONFIG::
-	Take the configuration from the given file instead of .git/config.
-	Using the "--global" option forces this to ~/.gitconfig. Using the
-	"--system" option forces this to $(prefix)/etc/gitconfig.
-
 GIT_CONFIG_GLOBAL::
 GIT_CONFIG_SYSTEM::
 	Take the configuration from the given files instead from global or
@@ -367,6 +367,12 @@ This is useful for cases where you want to spawn multiple git commands
 with a common configuration but cannot depend on a configuration file,
 for example when writing scripts.
 
+GIT_CONFIG::
+	If no `--file` option is provided to `git config`, use the file
+	given by `GIT_CONFIG` as if it were provided via `--file`. This
+	variable has no effect on other Git commands, and is mostly for
+	historical compatibility; there is generally no reason to use it
+	instead of the `--file` option.
 
 [[EXAMPLES]]
 EXAMPLES
diff --git a/git-pull.html b/git-pull.html
index 1ce7ecc25..e7d3c0077 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1134,7 +1134,7 @@ the local merge commits are included in the rebase (see
 <div class="paragraph"><p>When set to <code>preserve</code> (deprecated in favor of <code>merges</code>), rebase with the

 <code>--preserve-merges</code> option passed to <code>git rebase</code> so that locally created

 merge commits will not be flattened.</p></div>

-<div class="paragraph"><p>When false, merge the current branch into the upstream branch.</p></div>

+<div class="paragraph"><p>When false, merge the upstream branch into the current branch.</p></div>

 <div class="paragraph"><p>When <code>interactive</code>, enable the interactive mode of rebase.</p></div>

 <div class="paragraph"><p>See <code>pull.rebase</code>, <code>branch.&lt;name&gt;.rebase</code> and <code>branch.autoSetupRebase</code> in

 <a href="git-config.html">git-config(1)</a> if you want to make <code>git pull</code> always use

@@ -2263,7 +2263,7 @@ version.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-04-29 16:59:10 PDT

+ 2021-08-02 15:41:53 PDT

 </div>

 </div>

 </body>

diff --git a/git-pull.txt b/git-pull.txt
index 5c3fb67c0..7f4b2d198 100644
--- a/git-pull.txt
+++ b/git-pull.txt
@@ -117,7 +117,7 @@ When set to `preserve` (deprecated in favor of `merges`), rebase with the
 `--preserve-merges` option passed to `git rebase` so that locally created
 merge commits will not be flattened.
 +
-When false, merge the current branch into the upstream branch.
+When false, merge the upstream branch into the current branch.
 +
 When `interactive`, enable the interactive mode of rebase.
 +
diff --git a/git-tools.html b/git-tools.html
index 75072a0fe..7039886f3 100644
--- a/git-tools.html
+++ b/git-tools.html
@@ -752,7 +752,7 @@ more efficiently, so this manually-maintained list has been retired.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2017-04-27 11:19:22 JST

+ 2017-04-26 19:19:22 PDT

 </div>

 </div>

 </body>

diff --git a/howto-index.html b/howto-index.html
index 541f90d8c..e3e04f43a 100644
--- a/howto-index.html
+++ b/howto-index.html
@@ -894,7 +894,7 @@ later validate it.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-06-06 17:01:54 JST

+ 2021-08-02 15:41:58 PDT

 </div>

 </div>

 </body>

diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index e29ae6bbc..1e08965e6 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-07-28 13:59:47 PDT

+ 2021-08-02 15:42:06 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 2d2cab959..80a28c73b 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-07-28 13:59:47 PDT

+ 2021-08-02 15:42:05 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 36658e30c..7c92e3e7b 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-07-28 13:59:47 PDT

+ 2021-08-02 15:42:06 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 70c2c4546..f9832585a 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-07-28 13:59:41 PDT

+ 2021-08-02 15:42:00 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 979ce4538..2da45661d 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-07-28 13:59:46 PDT

+ 2021-08-02 15:42:05 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 8457c3cb4..28071f1d5 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-07-28 13:59:46 PDT

+ 2021-08-02 15:42:05 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 929841a6d..f6546583d 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-07-28 13:59:45 PDT

+ 2021-08-02 15:42:04 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 3f2f29445..9fbb457cc 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-07-28 13:59:46 PDT

+ 2021-08-02 15:42:05 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 39ff99dc5..09a4b082b 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-07-28 13:59:44 PDT

+ 2021-08-02 15:42:04 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 583bbee94..55ce742f4 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-07-28 13:59:41 PDT

+ 2021-08-02 15:42:01 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index a93392125..d8005eff7 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-07-28 13:59:44 PDT

+ 2021-08-02 15:42:04 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 561082e32..3eb3bca0e 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-07-28 13:59:43 PDT

+ 2021-08-02 15:42:03 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index c3bd1e6b1..0475c159a 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-07-28 13:59:43 PDT

+ 2021-08-02 15:42:02 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 7da2fc0a8..9f7cc2629 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-07-28 13:59:43 PDT

+ 2021-08-02 15:42:02 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 9d4db38c6..cbe6266a9 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-07-28 13:59:42 PDT

+ 2021-08-02 15:42:01 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 33077aa4d..4b0abe0bf 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-07-28 13:59:42 PDT

+ 2021-08-02 15:42:01 PDT

 </div>

 </div>

 </body>

diff --git a/technical/api-index.html b/technical/api-index.html
index 4e5b295db..04a21aa60 100644
--- a/technical/api-index.html
+++ b/technical/api-index.html
@@ -775,7 +775,7 @@ documents them.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-06-06 01:02:04 PDT

+ 2021-08-02 15:42:16 PDT

 </div>

 </div>

 </body>