Autogenerated HTML docs for v2.39.0-189-g4dbeb

25 files changed, 150 insertions, 71 deletions

diff --git a/RelNotes/2.40.0.txt b/RelNotes/2.40.0.txt
index 80b3b5040..5193a99df 100644
--- a/RelNotes/2.40.0.txt
+++ b/RelNotes/2.40.0.txt
@@ -26,6 +26,9 @@ UI, Workflows & Features
  * "git format-patch" learned to honor format.mboxrd even when sending
    patches to the standard output stream,
 
+ * 'cat-file' gains mailmap support for its '--batch-check' and '-s'
+   options.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -37,6 +40,14 @@ Performance, Internal Implementation, Development Support etc.
  * Use the SHA1DC implementation on macOS, just like other platforms,
    by default.
 
+ * Even in a repository with promisor remote, it is useless to
+   attempt to lazily attempt fetching an object that is expected to be
+   commit, because no "filter" mode omits commit objects.  Take
+   advantage of this assumption to fail fast on errors.
+
+ * Stop using "git --super-prefix" and narrow the scope of its use to
+   the submodule--helper.
+
 
 Fixes since v2.39
 -----------------
@@ -94,6 +105,9 @@ Fixes since v2.39
    flush its output to the disk..
    (merge ce54672f9b ps/fsync-refs-fix later to maint).
 
+ * Fix to a small regression in 2.38 days.
+   (merge 6d5e9e53aa ab/bundle-wo-args later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 77e04b2ed4 rs/t4205-do-not-exit-in-test-script later to maint).
    (merge faebba436e rs/plug-pattern-list-leak-in-lof later to maint).
@@ -110,3 +124,6 @@ Fixes since v2.39
    (merge b07a819c05 rs/reflog-expiry-cleanup later to maint).
    (merge d422d06167 rs/clarify-error-in-write-loose-object later to maint).
    (merge 92cb135855 sk/remove-duplicate-includes later to maint).
+   (merge 4eb1ccecd4 dh/mingw-ownership-check-typofix later to maint).
+   (merge f95526419b ar/typofix-gitattributes-doc later to maint).
+   (merge 27875aeec9 km/doc-branch-start-point later to maint).
diff --git a/git-branch.html b/git-branch.html
index a2f7dafbc..a155cc7fa 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -875,7 +875,7 @@ way to clean up all obsolete remote-tracking branches.</p></div>
 </dt>

 <dd>

 <p>

-        Reset &lt;branchname&gt; to &lt;startpoint&gt;, even if &lt;branchname&gt; exists

+        Reset &lt;branchname&gt; to &lt;start-point&gt;, even if &lt;branchname&gt; exists

         already. Without <code>-f</code>, <em>git branch</em> refuses to change an existing branch.

         In combination with <code>-d</code> (or <code>--delete</code>), allow deleting the

         branch irrespective of its merged status, or whether it even

@@ -1580,7 +1580,7 @@ a branch?&#8221;</a> in the Git User&#8217;s Manual.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-09-15 05:23:11 JST

+ 2023-01-05 15:32:44 JST

 </div>

 </div>

 </body>

diff --git a/git-branch.txt b/git-branch.txt
index 12c5f84e3..aa2f78c4c 100644
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -116,7 +116,7 @@ OPTIONS
 
 -f::
 --force::
-	Reset <branchname> to <startpoint>, even if <branchname> exists
+	Reset <branchname> to <start-point>, even if <branchname> exists
 	already. Without `-f`, 'git branch' refuses to change an existing branch.
 	In combination with `-d` (or `--delete`), allow deleting the
 	branch irrespective of its merged status, or whether it even
diff --git a/git-cat-file.html b/git-cat-file.html
index 3dc3cc4c2..b26b5792e 100644
--- a/git-cat-file.html
+++ b/git-cat-file.html
@@ -805,7 +805,9 @@ whitespace, so that the appropriate drivers can be determined.</p></div>
 <dd>

 <p>

         Instead of the content, show the object size identified by

-        <code>&lt;object&gt;</code>.

+        <code>&lt;object&gt;</code>. If used with <code>--use-mailmap</code> option, will show

+        the size of updated object after replacing idents using the

+        mailmap mechanism.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -893,11 +895,29 @@ whitespace, so that the appropriate drivers can be determined.</p></div>
 <dd>

 <p>

         Print object information and contents for each object provided

-        on stdin.  May not be combined with any other options or arguments

-        except <code>--textconv</code> or <code>--filters</code>, in which case the input lines

-        also need to specify the path, separated by whitespace.  See the

-        section <code>BATCH OUTPUT</code> below for details.

+        on stdin. May not be combined with any other options or arguments

+        except <code>--textconv</code>, <code>--filters</code>, or <code>--use-mailmap</code>.

+       <br />

+</p>

+<div class="ulist"><ul>

+<li>

+<p>

+When used with <code>--textconv</code> or <code>--filters</code>, the input lines

+          must specify the path, separated by whitespace. See the section

+          <code>BATCH OUTPUT</code> below for details.

+       <br />

 </p>

+</li>

+<li>

+<p>

+When used with <code>--use-mailmap</code>, for commit and tag objects, the

+          contents part of the output shows the identities replaced using the

+          mailmap mechanism, while the information part of the output shows

+          the size of the object as if it actually recorded the replacement

+          identities.

+</p>

+</li>

+</ul></div>

 </dd>

 <dt class="hdlist1">

 --batch-check

@@ -907,12 +927,28 @@ whitespace, so that the appropriate drivers can be determined.</p></div>
 </dt>

 <dd>

 <p>

-        Print object information for each object provided on stdin.  May

-        not be combined with any other options or arguments except

-        <code>--textconv</code> or <code>--filters</code>, in which case the input lines also

-        need to specify the path, separated by whitespace.  See the

-        section <code>BATCH OUTPUT</code> below for details.

+        Print object information for each object provided on stdin. May not be

+        combined with any other options or arguments except <code>--textconv</code>, <code>--filters</code>

+        or <code>--use-mailmap</code>.

+       <br />

+</p>

+<div class="ulist"><ul>

+<li>

+<p>

+When used with <code>--textconv</code> or <code>--filters</code>, the input lines must

+         specify the path, separated by whitespace. See the section

+         <code>BATCH OUTPUT</code> below for details.

+       <br />

 </p>

+</li>

+<li>

+<p>

+When used with <code>--use-mailmap</code>, for commit and tag objects, the

+          printed object information shows the size of the object as if the

+          identities recorded in it were replaced by the mailmap mechanism.

+</p>

+</li>

+</ul></div>

 </dd>

 <dt class="hdlist1">

 --batch-command

@@ -923,11 +959,29 @@ whitespace, so that the appropriate drivers can be determined.</p></div>
 <dd>

 <p>

         Enter a command mode that reads commands and arguments from stdin. May

-        only be combined with <code>--buffer</code>, <code>--textconv</code> or <code>--filters</code>. In the

-        case of <code>--textconv</code> or <code>--filters</code>, the input lines also need to specify

-        the path, separated by whitespace. See the section <code>BATCH OUTPUT</code> below

-        for details.

+        only be combined with <code>--buffer</code>, <code>--textconv</code>, <code>--use-mailmap</code> or

+        <code>--filters</code>.

+       <br />

+</p>

+<div class="ulist"><ul>

+<li>

+<p>

+When used with <code>--textconv</code> or <code>--filters</code>, the input lines must

+          specify the path, separated by whitespace. See the section

+          <code>BATCH OUTPUT</code> below for details.

+       <br />

+</p>

+</li>

+<li>

+<p>

+When used with <code>--use-mailmap</code>, for commit and tag objects, the

+          <code>contents</code> command shows the identities replaced using the

+          mailmap mechanism, while the <code>info</code> command shows the size

+          of the object as if it actually recorded the replacement

+          identities.

 </p>

+</li>

+</ul></div>

 <div class="paragraph"><p><code>--batch-command</code> recognizes the following commands:</p></div>

 <div class="openblock">

 <div class="content">

@@ -1273,7 +1327,7 @@ will be reported.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-08-06 08:26:23 JST

+ 2023-01-05 15:32:44 JST

 </div>

 </div>

 </body>

diff --git a/git-cat-file.txt b/git-cat-file.txt
index ec30b5c57..830f0a2ef 100644
--- a/git-cat-file.txt
+++ b/git-cat-file.txt
@@ -45,7 +45,9 @@ OPTIONS
 
 -s::
 	Instead of the content, show the object size identified by
-	`<object>`.
+	`<object>`. If used with `--use-mailmap` option, will show
+	the size of updated object after replacing idents using the
+	mailmap mechanism.
 
 -e::
 	Exit with zero status if `<object>` exists and is a valid
@@ -89,26 +91,49 @@ OPTIONS
 --batch::
 --batch=<format>::
 	Print object information and contents for each object provided
-	on stdin.  May not be combined with any other options or arguments
-	except `--textconv` or `--filters`, in which case the input lines
-	also need to specify the path, separated by whitespace.  See the
-	section `BATCH OUTPUT` below for details.
+	on stdin. May not be combined with any other options or arguments
+	except `--textconv`, `--filters`, or `--use-mailmap`.
+	+
+	* When used with `--textconv` or `--filters`, the input lines
+	  must specify the path, separated by whitespace. See the section
+	  `BATCH OUTPUT` below for details.
+	+
+	* When used with `--use-mailmap`, for commit and tag objects, the
+	  contents part of the output shows the identities replaced using the
+	  mailmap mechanism, while the information part of the output shows
+	  the size of the object as if it actually recorded the replacement
+	  identities.
 
 --batch-check::
 --batch-check=<format>::
-	Print object information for each object provided on stdin.  May
-	not be combined with any other options or arguments except
-	`--textconv` or `--filters`, in which case the input lines also
-	need to specify the path, separated by whitespace.  See the
-	section `BATCH OUTPUT` below for details.
+	Print object information for each object provided on stdin. May not be
+	combined with any other options or arguments except `--textconv`, `--filters`
+	or `--use-mailmap`.
+	+
+	* When used with `--textconv` or `--filters`, the input lines must
+	 specify the path, separated by whitespace. See the section
+	 `BATCH OUTPUT` below for details.
+	+
+	* When used with `--use-mailmap`, for commit and tag objects, the
+	  printed object information shows the size of the object as if the
+	  identities recorded in it were replaced by the mailmap mechanism.
 
 --batch-command::
 --batch-command=<format>::
 	Enter a command mode that reads commands and arguments from stdin. May
-	only be combined with `--buffer`, `--textconv` or `--filters`. In the
-	case of `--textconv` or `--filters`, the input lines also need to specify
-	the path, separated by whitespace. See the section `BATCH OUTPUT` below
-	for details.
+	only be combined with `--buffer`, `--textconv`, `--use-mailmap` or
+	`--filters`.
+	+
+	* When used with `--textconv` or `--filters`, the input lines must
+	  specify the path, separated by whitespace. See the section
+	  `BATCH OUTPUT` below for details.
+	+
+	* When used with `--use-mailmap`, for commit and tag objects, the
+	  `contents` command shows the identities replaced using the
+	  mailmap mechanism, while the `info` command shows the size
+	  of the object as if it actually recorded the replacement
+	  identities.
+
 +
 `--batch-command` recognizes the following commands:
 +
diff --git a/git.html b/git.html
index 8c94130fb..9b21592ec 100644
--- a/git.html
+++ b/git.html
@@ -753,8 +753,7 @@ git(1) Manual Page
     [--exec-path[=&lt;path&gt;]] [--html-path] [--man-path] [--info-path]

     [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]

     [--git-dir=&lt;path&gt;] [--work-tree=&lt;path&gt;] [--namespace=&lt;name&gt;]

-    [--super-prefix=&lt;path&gt;] [--config-env=&lt;name&gt;=&lt;envvar&gt;]

-    &lt;command&gt; [&lt;args&gt;]</pre>

+    [--config-env=&lt;name&gt;=&lt;envvar&gt;] &lt;command&gt; [&lt;args&gt;]</pre>

 <div class="attribution">

 </div></div>

 </div>

@@ -985,16 +984,6 @@ environment variable)</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

---super-prefix=&lt;path&gt;

-</dt>

-<dd>

-<p>

-        Currently for internal use only.  Set a prefix which gives a path from

-        above a repository down to its root.  One use is to give submodules

-        context about the superproject that invoked it.

-</p>

-</dd>

-<dt class="hdlist1">

 --bare

 </dt>

 <dd>

@@ -3807,7 +3796,7 @@ the Git Security mailing list &lt;<a href="mailto:git-security@googlegroups.com"
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-10-11 06:40:17 JST

+ 2023-01-05 15:32:44 JST

 </div>

 </div>

 </body>

diff --git a/git.txt b/git.txt
index 1d33e083a..f9a7a4554 100644
--- a/git.txt
+++ b/git.txt
@@ -13,8 +13,7 @@ SYNOPSIS
     [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
     [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]
     [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
-    [--super-prefix=<path>] [--config-env=<name>=<envvar>]
-    <command> [<args>]
+    [--config-env=<name>=<envvar>] <command> [<args>]
 
 DESCRIPTION
 -----------
@@ -169,11 +168,6 @@ If you just want to run git as if it was started in `<path>` then use
 	details.  Equivalent to setting the `GIT_NAMESPACE` environment
 	variable.
 
---super-prefix=<path>::
-	Currently for internal use only.  Set a prefix which gives a path from
-	above a repository down to its root.  One use is to give submodules
-	context about the superproject that invoked it.
-
 --bare::
 	Treat the repository as a bare repository.  If GIT_DIR
 	environment is not set, it is set to the current working
diff --git a/gitattributes.html b/gitattributes.html
index b428c6b8d..30c7a54e9 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -2027,7 +2027,7 @@ String
 </dt>

 <dd>

 <p>

-        Specify a comma separate list of common whitespace problems to

+        Specify a comma separated list of common whitespace problems to

         notice in the same format as the <code>core.whitespace</code> configuration

         variable.

 </p>

@@ -2202,7 +2202,7 @@ frotz   unspecified</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-03-28 02:29:17 JST

+ 2023-01-05 15:32:44 JST

 </div>

 </div>

 </body>

diff --git a/gitattributes.txt b/gitattributes.txt
index 4b36d51be..c19e64ea0 100644
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -1155,7 +1155,7 @@ Unspecified::
 
 String::
 
-	Specify a comma separate list of common whitespace problems to
+	Specify a comma separated list of common whitespace problems to
 	notice in the same format as the `core.whitespace` configuration
 	variable.
 
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 59d760219..cf4c7f9d2 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -1038,7 +1038,7 @@ Thanks,
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-01-02 22:38:08 JST

+ 2023-01-05 15:33:19 JST

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 4714f742c..da5400329 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

- 2023-01-02 22:38:08 JST

+ 2023-01-05 15:33:18 JST

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 18a64f33d..603899bac 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -1478,7 +1478,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-01-02 22:38:08 JST

+ 2023-01-05 15:33:19 JST

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 782c76d92..46772654b 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

- 2023-01-02 22:38:06 JST

+ 2023-01-05 15:33:16 JST

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 327b6bdb2..e1fd6169d 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

- 2023-01-02 22:38:08 JST

+ 2023-01-05 15:33:18 JST

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index c6ade29bf..58ddfe1d1 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

- 2023-01-02 22:38:08 JST

+ 2023-01-05 15:33:18 JST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 768df1251..42ff0b035 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

- 2023-01-02 22:38:08 JST

+ 2023-01-05 15:33:18 JST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index f5721b92a..7357519df 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

- 2023-01-02 22:38:08 JST

+ 2023-01-05 15:33:18 JST

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 0eb529d27..1466ec293 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

- 2023-01-02 22:38:07 JST

+ 2023-01-05 15:33:18 JST

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 7039f81a8..6cd11222f 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

- 2023-01-02 22:38:06 JST

+ 2023-01-05 15:33:16 JST

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 0852b3268..42bbb8fb1 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

- 2023-01-02 22:38:07 JST

+ 2023-01-05 15:33:18 JST

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 91f2a750d..dd08004ec 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

- 2023-01-02 22:38:07 JST

+ 2023-01-05 15:33:17 JST

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 0c93aa6f1..aef278703 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

- 2023-01-02 22:38:07 JST

+ 2023-01-05 15:33:17 JST

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index ea9e1ddf7..31ca4a71f 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

- 2023-01-02 22:38:07 JST

+ 2023-01-05 15:33:17 JST

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 8cf4acf65..0d517c3ab 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

- 2023-01-02 22:38:06 JST

+ 2023-01-05 15:33:17 JST

 </div>

 </div>

 </body>

diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index ac20d4c52..3a111eaae 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

- 2023-01-02 22:38:06 JST

+ 2023-01-05 15:33:17 JST

 </div>

 </div>

 </body>