Autogenerated HTML docs for v2.37.1-357-g4af71

21 files changed, 187 insertions, 20 deletions

diff --git a/RelNotes/2.38.0.txt b/RelNotes/2.38.0.txt
index 66e278b4f..335b0e8e7 100644
--- a/RelNotes/2.38.0.txt
+++ b/RelNotes/2.38.0.txt
@@ -36,6 +36,15 @@ UI, Workflows & Features
  * "git rebase -i" learns to update branches whose tip appear in the
    rebased range with "--update-refs" option.
 
+ * "git ls-files" learns the "--format" option to tweak its output.
+
+ * "git cat-file" learned an option to use the mailmap when showing
+   commit and tag objects.
+
+ * When "git merge" finds that it cannot perform a merge, it should
+   restore the working tree to the state before the command was
+   initiated, but in some corner cases it didn't.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -85,6 +94,13 @@ Performance, Internal Implementation, Development Support etc.
 
  * Omit fsync-related trace2 entries when their values are all zero.
 
+ * The codepath to write multi-pack index has been taught to release a
+   large chunk of memory that holds an array of objects in the packs,
+   as soon as it is done with the array, to reduce memory consumption.
+
+ * Add a level of redirection to array allocation API in xdiff part,
+   to make it easier to share with the libgit2 project.
+
 
 Fixes since v2.37
 -----------------
@@ -184,8 +200,17 @@ Fixes since v2.37
    corrected.
    (merge 611c7785e8 mt/checkout-count-fix later to maint).
 
+ * Fix for a bug that makes write-tree to fail to write out a
+   non-existent index as a tree, introduced in 2.37.
+   (merge 4447d4129d tk/untracked-cache-with-uall later to maint).
+
+ * There was a bug in the codepath to upgrade generation information
+   in commit-graph from v1 to v2 format, which has been corrected.
+   (merge 9550f6c16a tb/commit-graph-genv2-upgrade-fix later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge a700395eaf ma/t4200-update later to maint).
    (merge ae436f283c ma/sparse-checkout-cone-doc-fix later to maint).
    (merge a10f6e2bda sg/index-format-doc-update later to maint).
    (merge ce5f07983d mt/pkt-line-comment-tweak later to maint).
+   (merge 1e11fab59c jc/string-list-cleanup later to maint).
diff --git a/git-cat-file.html b/git-cat-file.html
index b67c5d638..9471f9acc 100644
--- a/git-cat-file.html
+++ b/git-cat-file.html
@@ -840,6 +840,19 @@ whitespace, so that the appropriate drivers can be determined.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+--[no-]mailmap

+</dt>

+<dt class="hdlist1">

+--[no-]use-mailmap

+</dt>

+<dd>

+<p>

+       Use mailmap file to map author, committer and tagger names

+       and email addresses to canonical real names and email addresses.

+       See <a href="git-shortlog.html">git-shortlog(1)</a>.

+</p>

+</dd>

+<dt class="hdlist1">

 --textconv

 </dt>

 <dd>

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

 <div id="footer-text">

 Last updated

- 2022-04-07 15:08:14 PDT

+ 2022-08-03 14:33:44 PDT

 </div>

 </div>

 </body>

diff --git a/git-cat-file.txt b/git-cat-file.txt
index 24a811f0e..1880e9bba 100644
--- a/git-cat-file.txt
+++ b/git-cat-file.txt
@@ -63,6 +63,12 @@ OPTIONS
 	or to ask for a "blob" with `<object>` being a tag object that
 	points at it.
 
+--[no-]mailmap::
+--[no-]use-mailmap::
+       Use mailmap file to map author, committer and tagger names
+       and email addresses to canonical real names and email addresses.
+       See linkgit:git-shortlog[1].
+
 --textconv::
 	Show the content as transformed by a textconv filter. In this case,
 	`<object>` has to be of the form `<tree-ish>:<path>`, or `:<path>` in
diff --git a/git-ls-files.html b/git-ls-files.html
index d2961caaa..b3772663f 100644
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -760,7 +760,7 @@ git-ls-files(1) Manual Page
                 [--exclude-standard]

                 [--error-unmatch] [--with-tree=&lt;tree-ish&gt;]

                 [--full-name] [--recurse-submodules]

-                [--abbrev[=&lt;n&gt;]] [--] [&lt;file&gt;&#8230;]</pre>

+                [--abbrev[=&lt;n&gt;]] [--format=&lt;format&gt;] [--] [&lt;file&gt;&#8230;]</pre>

 <div class="attribution">

 </div></div>

 </div>

@@ -1141,6 +1141,19 @@ followed by the  ("attr/&lt;eolattr&gt;").</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+--format=&lt;format&gt;

+</dt>

+<dd>

+<p>

+        A string that interpolates <code>%(fieldname)</code> from the result being shown.

+        It also interpolates <code>%%</code> to <code>%</code>, and <code>%xx</code> where <code>xx</code> are hex digits

+        interpolates to character with hex code <code>xx</code>; for example <code>%00</code>

+        interpolates to <code>\0</code> (NUL), <code>%09</code> to <code>\t</code> (TAB) and %0a to <code>\n</code> (LF).

+        --format cannot be combined with <code>-s</code>, <code>-o</code>, <code>-k</code>, <code>-t</code>, <code>--resolve-undo</code>

+        and <code>--eol</code>.

+</p>

+</dd>

+<dt class="hdlist1">

 --

 </dt>

 <dd>

@@ -1182,6 +1195,79 @@ path. (see <a href="git-read-tree.html">git-read-tree(1)</a> for more informatio
 quoted as explained for the configuration variable <code>core.quotePath</code>

 (see <a href="git-config.html">git-config(1)</a>).  Using <code>-z</code> the filename is output

 verbatim and the line is terminated by a NUL byte.</p></div>

+<div class="paragraph"><p>It is possible to print in a custom format by using the <code>--format</code>

+option, which is able to interpolate different fields using

+a <code>%(fieldname)</code> notation. For example, if you only care about the

+"objectname" and "path" fields, you can execute with a specific

+"--format" like</p></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>git ls-files --format='%(objectname) %(path)'</code></pre>

+</div></div>

+</div>

+</div>

+<div class="sect1">

+<h2 id="_field_names">FIELD NAMES</h2>

+<div class="sectionbody">

+<div class="paragraph"><p>The way each path is shown can be customized by using the

+<code>--format=&lt;format&gt;</code> option, where the %(fieldname) in the

+&lt;format&gt; string for various aspects of the index entry are

+interpolated.  The following "fieldname" are understood:</p></div>

+<div class="dlist"><dl>

+<dt class="hdlist1">

+objectmode

+</dt>

+<dd>

+<p>

+        The mode of the file which is recorded in the index.

+</p>

+</dd>

+<dt class="hdlist1">

+objectname

+</dt>

+<dd>

+<p>

+        The name of the file which is recorded in the index.

+</p>

+</dd>

+<dt class="hdlist1">

+stage

+</dt>

+<dd>

+<p>

+        The stage of the file which is recorded in the index.

+</p>

+</dd>

+<dt class="hdlist1">

+eolinfo:index

+</dt>

+<dt class="hdlist1">

+eolinfo:worktree

+</dt>

+<dd>

+<p>

+        The &lt;eolinfo&gt; (see the description of the <code>--eol</code> option) of

+        the contents in the index or in the worktree for the path.

+</p>

+</dd>

+<dt class="hdlist1">

+eolattr

+</dt>

+<dd>

+<p>

+        The &lt;eolattr&gt; (see the description of the <code>--eol</code> option)

+        that applies to the path.

+</p>

+</dd>

+<dt class="hdlist1">

+path

+</dt>

+<dd>

+<p>

+        The pathname of the file which is recorded in the index.

+</p>

+</dd>

+</dl></div>

 </div>

 </div>

 <div class="sect1">

@@ -1241,7 +1327,7 @@ pattern file appears in.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-03-07 14:39:03 PST

+ 2022-08-03 14:33:44 PDT

 </div>

 </div>

 </body>

diff --git a/git-ls-files.txt b/git-ls-files.txt
index 0dabf3f0d..d7986419c 100644
--- a/git-ls-files.txt
+++ b/git-ls-files.txt
@@ -20,7 +20,7 @@ SYNOPSIS
 		[--exclude-standard]
 		[--error-unmatch] [--with-tree=<tree-ish>]
 		[--full-name] [--recurse-submodules]
-		[--abbrev[=<n>]] [--] [<file>...]
+		[--abbrev[=<n>]] [--format=<format>] [--] [<file>...]
 
 DESCRIPTION
 -----------
@@ -192,6 +192,13 @@ followed by the  ("attr/<eolattr>").
 	to the contained files. Sparse directories will be shown with a
 	trailing slash, such as "x/" for a sparse directory "x".
 
+--format=<format>::
+	A string that interpolates `%(fieldname)` from the result being shown.
+	It also interpolates `%%` to `%`, and `%xx` where `xx` are hex digits
+	interpolates to character with hex code `xx`; for example `%00`
+	interpolates to `\0` (NUL), `%09` to `\t` (TAB) and %0a to `\n` (LF).
+	--format cannot be combined with `-s`, `-o`, `-k`, `-t`, `--resolve-undo`
+	and `--eol`.
 \--::
 	Do not interpret any more arguments as options.
 
@@ -223,6 +230,36 @@ quoted as explained for the configuration variable `core.quotePath`
 (see linkgit:git-config[1]).  Using `-z` the filename is output
 verbatim and the line is terminated by a NUL byte.
 
+It is possible to print in a custom format by using the `--format`
+option, which is able to interpolate different fields using
+a `%(fieldname)` notation. For example, if you only care about the
+"objectname" and "path" fields, you can execute with a specific
+"--format" like
+
+	git ls-files --format='%(objectname) %(path)'
+
+FIELD NAMES
+-----------
+The way each path is shown can be customized by using the
+`--format=<format>` option, where the %(fieldname) in the
+<format> string for various aspects of the index entry are
+interpolated.  The following "fieldname" are understood:
+
+objectmode::
+	The mode of the file which is recorded in the index.
+objectname::
+	The name of the file which is recorded in the index.
+stage::
+	The stage of the file which is recorded in the index.
+eolinfo:index::
+eolinfo:worktree::
+	The <eolinfo> (see the description of the `--eol` option) of
+	the contents in the index or in the worktree for the path.
+eolattr::
+	The <eolattr> (see the description of the `--eol` option)
+	that applies to the path.
+path::
+	The pathname of the file which is recorded in the index.
 
 EXCLUDE PATTERNS
 ----------------
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 19eb35a7c..ba72bf679 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

- 2022-08-01 10:59:34 PDT

+ 2022-08-03 14:34:13 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 3881e97b7..e486420d1 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

- 2022-08-01 10:59:34 PDT

+ 2022-08-03 14:34:13 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index a6f996383..e647aa1dc 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

- 2022-08-01 10:59:34 PDT

+ 2022-08-03 14:34:13 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index e91db37ee..8eeb67ced 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

- 2022-08-01 10:59:31 PDT

+ 2022-08-03 14:34:11 PDT

 </div>

 </div>

 </body>

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

- 2022-08-01 10:59:34 PDT

+ 2022-08-03 14:34:13 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 52fe83a73..e6fba0f0d 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

- 2022-08-01 10:59:33 PDT

+ 2022-08-03 14:34:13 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 1c5131c2b..73d76f120 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

- 2022-08-01 10:59:33 PDT

+ 2022-08-03 14:34:13 PDT

 </div>

 </div>

 </body>

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

- 2022-08-01 10:59:33 PDT

+ 2022-08-03 14:34:13 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 559eee694..0c598e693 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

- 2022-08-01 10:59:33 PDT

+ 2022-08-03 14:34:13 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 37de722cf..b740e5d2d 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

- 2022-08-01 10:59:32 PDT

+ 2022-08-03 14:34:12 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 2fa0a52a1..abff54ca7 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

- 2022-08-01 10:59:33 PDT

+ 2022-08-03 14:34:13 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 5dedc3a75..15d53b035 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

- 2022-08-01 10:59:32 PDT

+ 2022-08-03 14:34:12 PDT

 </div>

 </div>

 </body>

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

- 2022-08-01 10:59:32 PDT

+ 2022-08-03 14:34:12 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index c6fe51cdc..8783a2cd0 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

- 2022-08-01 10:59:32 PDT

+ 2022-08-03 14:34:12 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index de1d609a9..88772516c 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

- 2022-08-01 10:59:32 PDT

+ 2022-08-03 14:34:12 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 bd7db6874..ffb55fce5 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

- 2022-08-01 10:59:32 PDT

+ 2022-08-03 14:34:12 PDT

 </div>

 </div>

 </body>