Autogenerated HTML docs for v2.44.0-448-gc2cbf

git · Apr 1, 2024 · e990114 · e990114
1 parent c416a71
commit e990114
Show file tree

Hide file tree

Showing 49 changed files with 129 additions and 91 deletions.
diff --git a/MyFirstContribution.html b/MyFirstContribution.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>My First Contribution to the Git Project</h1>
-<span id="revdate">2024-03-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>My First Object Walk</h1>
-<span id="revdate">2024-03-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/RelNotes/2.45.0.txt b/RelNotes/2.45.0.txt
@@ -57,6 +57,9 @@ UI, Workflows & Features
  * Remove an ancient and not well maintained Hg-to-git migration
    script from contrib/.
 
+ * Hints that suggest what to do after resolving conflicts can now be
+   squelched by disabling advice.mergeConflict.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -111,6 +114,10 @@ Performance, Internal Implementation, Development Support etc.
  * A new fuzz target that exercises config parsing code has been
    added.
 
+ * Fix the way recently added tests interpolate variables defined
+   outside them, and document the best practice to help future
+   developers.
+
 
 Fixes since v2.44
 -----------------
@@ -244,6 +251,25 @@ Fixes since v2.44
    updated.
    (merge bff85a338c bl/doc-key-val-sep-fix later to maint).
 
+ * "git checkout --conflict=bad" reported a bad conflictStyle as if it
+   were given to a configuration variable; it has been corrected to
+   report that the command line option is bad.
+   (merge 5a99c1ac1a pw/checkout-conflict-errorfix later to maint).
+
+ * Code clean-up in the "git log" machinery that implements custom log
+   message formatting.
+   (merge 1c10b8e5b0 jk/pretty-subject-cleanup later to maint).
+
+ * "git config" corrupted literal HT characters written in the
+   configuration file as part of a value, which has been corrected.
+   (merge e6895c3f97 ds/config-internal-whitespace-fix later to maint).
+
+ * A unit test for reftable code tried to enumerate all files in a
+   directory after reftable operations and expected to see nothing but
+   the files it wanted to leave there, but was fooled by .nfs* cruft
+   files left, which has been corrected.
+   (merge 0068aa7946 ps/reftable-unit-test-nfs-workaround later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge f0e578c69c rs/use-xstrncmpz later to maint).
    (merge 83e6eb7d7a ba/credential-test-clean-fix later to maint).

diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Reviewing Patches in the Git Project</h1>
-<span id="revdate">2024-03-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/SubmittingPatches.html b/SubmittingPatches.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Submitting Patches</h1>
-<span id="revdate">2024-03-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/ToolsForGit.html b/ToolsForGit.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Tools for developing Git</h1>
-<span id="revdate">2024-03-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/config.txt b/config.txt
@@ -22,9 +22,10 @@ multivalued.
 Syntax
 ~~~~~~
 
-The syntax is fairly flexible and permissive; whitespaces are mostly
-ignored.  The '#' and ';' characters begin comments to the end of line,
-blank lines are ignored.
+The syntax is fairly flexible and permissive.  Whitespace characters,
+which in this context are the space character (SP) and the horizontal
+tabulation (HT), are mostly ignored.  The '#' and ';' characters begin
+comments to the end of line.  Blank lines are ignored.
 
 The file consists of sections and variables.  A section begins with
 the name of the section in square brackets and continues until the next
@@ -63,16 +64,17 @@ the variable is the boolean "true").
 The variable names are case-insensitive, allow only alphanumeric characters
 and `-`, and must start with an alphabetic character.
 
-A line that defines a value can be continued to the next line by
-ending it with a `\`; the backslash and the end-of-line are
-stripped.  Leading whitespaces after 'name =', the remainder of the
-line after the first comment character '#' or ';', and trailing
-whitespaces of the line are discarded unless they are enclosed in
-double quotes.  Internal whitespaces within the value are retained
-verbatim.
-
-Inside double quotes, double quote `"` and backslash `\` characters
-must be escaped: use `\"` for `"` and `\\` for `\`.
+Whitespace characters surrounding `name`, `=` and `value` are discarded.
+Internal whitespace characters within 'value' are retained verbatim.
+Comments starting with either `#` or `;` and extending to the end of line
+are discarded.  A line that defines a value can be continued to the next
+line by ending it with a backslash (`\`);  the backslash and the end-of-line
+characters are discarded.
+
+If `value` needs to contain leading or trailing whitespace characters,
+it must be enclosed in double quotation marks (`"`).  Inside double quotation
+marks, double quote (`"`) and backslash (`\`) characters must be escaped:
+use `\"` for `"` and `\\` for `\`.
 
 The following escape sequences (beside `\"` and `\\`) are recognized:
 `\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB)

diff --git a/everyday.html b/everyday.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Everyday Git With 20 Commands Or So</h1>
-<span id="revdate">2024-03-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">

diff --git a/git-config.html b/git-config.html
@@ -1588,9 +1588,10 @@ <h2 id="_configuration_file">CONFIGURATION FILE</h2>
 multivalued.</p></div>
 <div class="sect2">
 <h3 id="_syntax">Syntax</h3>
-<div class="paragraph"><p>The syntax is fairly flexible and permissive; whitespaces are mostly
-ignored.  The <em>#</em> and <em>;</em> characters begin comments to the end of line,
-blank lines are ignored.</p></div>
+<div class="paragraph"><p>The syntax is fairly flexible and permissive.  Whitespace characters,
+which in this context are the space character (SP) and the horizontal
+tabulation (HT), are mostly ignored.  The <em>#</em> and <em>;</em> characters begin
+comments to the end of line.  Blank lines are ignored.</p></div>
 <div class="paragraph"><p>The file consists of sections and variables.  A section begins with
 the name of the section in square brackets and continues until the next
 section begins.  Section names are case-insensitive.  Only alphanumeric
@@ -1622,15 +1623,16 @@ <h3 id="_syntax">Syntax</h3>
 the variable is the boolean "true").
 The variable names are case-insensitive, allow only alphanumeric characters
 and <code>-</code>, and must start with an alphabetic character.</p></div>
-<div class="paragraph"><p>A line that defines a value can be continued to the next line by
-ending it with a <code>\</code>; the backslash and the end-of-line are
-stripped.  Leading whitespaces after <em>name =</em>, the remainder of the
-line after the first comment character <em>#</em> or <em>;</em>, and trailing
-whitespaces of the line are discarded unless they are enclosed in
-double quotes.  Internal whitespaces within the value are retained
-verbatim.</p></div>
-<div class="paragraph"><p>Inside double quotes, double quote <code>"</code> and backslash <code>\</code> characters
-must be escaped: use <code>\"</code> for <code>"</code> and <code>\\</code> for <code>\</code>.</p></div>
+<div class="paragraph"><p>Whitespace characters surrounding <code>name</code>, <code>=</code> and <code>value</code> are discarded.
+Internal whitespace characters within <em>value</em> are retained verbatim.
+Comments starting with either <code>#</code> or <code>;</code> and extending to the end of line
+are discarded.  A line that defines a value can be continued to the next
+line by ending it with a backslash (<code>\</code>);  the backslash and the end-of-line
+characters are discarded.</p></div>
+<div class="paragraph"><p>If <code>value</code> needs to contain leading or trailing whitespace characters,
+it must be enclosed in double quotation marks (<code>"</code>).  Inside double quotation
+marks, double quote (<code>"</code>) and backslash (<code>\</code>) characters must be escaped:
+use <code>\"</code> for <code>"</code> and <code>\\</code> for <code>\</code>.</p></div>
 <div class="paragraph"><p>The following escape sequences (beside <code>\"</code> and <code>\\</code>) are recognized:
 <code>\n</code> for newline character (NL), <code>\t</code> for horizontal tabulation (HT, TAB)
 and <code>\b</code> for backspace (BS).  Other char escape sequences (including octal
@@ -2148,6 +2150,14 @@ <h3 id="_variables">Variables</h3>
 </p>
 </dd>
 <dt class="hdlist1">
+mergeConflict
+</dt>
+<dd>
+<p>
+                Shown when various commands stop because of conflicts.
+</p>
+</dd>
+<dt class="hdlist1">
 nestedTag
 </dt>
 <dd>

diff --git a/git-remote-helpers.html b/git-remote-helpers.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>git-remote-helpers</h1>
-<span id="revdate">2024-03-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">

diff --git a/gitremote-helpers.html b/gitremote-helpers.html
@@ -1369,15 +1369,15 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
-'option deepen-since &lt;timestamp&gt;
+<em>option deepen-since</em> &lt;timestamp&gt;
 </dt>
 <dd>
 <p>
         Deepens the history of a shallow repository based on time.
 </p>
 </dd>
 <dt class="hdlist1">
-'option deepen-not &lt;ref&gt;
+<em>option deepen-not</em> &lt;ref&gt;
 </dt>
 <dd>
 <p>
@@ -1386,7 +1386,7 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
-<em>option deepen-relative {'true</em>|<em>false</em>}
+<em>option deepen-relative</em> {<em>true</em>|<em>false</em>}
 </dt>
 <dd>
 <p>
@@ -1537,7 +1537,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-18 13:11:00 PDT
+ 2024-04-01 14:10:09 PDT
 </div>
 </div>
 </body>

diff --git a/gitremote-helpers.txt b/gitremote-helpers.txt
@@ -479,14 +479,14 @@ set by Git if the remote helper has the 'option' capability.
 'option depth' <depth>::
 	Deepens the history of a shallow repository.
 
-'option deepen-since <timestamp>::
+'option deepen-since' <timestamp>::
 	Deepens the history of a shallow repository based on time.
 
-'option deepen-not <ref>::
+'option deepen-not' <ref>::
 	Deepens the history of a shallow repository excluding ref.
 	Multiple options add up.
 
-'option deepen-relative {'true'|'false'}::
+'option deepen-relative' {'true'|'false'}::
 	Deepens the history of a shallow repository relative to
 	current boundary. Only valid when used with "option depth".
 

diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
@@ -1038,7 +1038,7 @@ <h3 id="_example_mail_to_a_href_mailto_oss_security_lists_openwall_com_oss_secur
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>Keep authoritative canonical history correct with git pull</h1>
-<span id="revdate">2024-03-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -939,7 +939,7 @@ <h1>Keep authoritative canonical history correct with git pull</h1>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>How to maintain Git</h1>
-<span id="revdate">2024-03-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div class="sect1">
@@ -1479,7 +1479,7 @@ <h3 id="_preparing_a_merge_fix">Preparing a "merge-fix"</h3>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>How to integrate new subcommands</h1>
-<span id="revdate">2024-03-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -864,7 +864,7 @@ <h2 id="_integrating_a_command">Integrating a command</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-28 14:36:31 PDT
+ 2024-04-01 14:10:32 PDT
 </div>
 </div>
 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>How to rebase from an internal branch</h1>
-<span id="revdate">2024-03-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -896,7 +896,7 @@ <h1>How to rebase from an internal branch</h1>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>How to rebuild from update hook</h1>
-<span id="revdate">2024-03-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -848,7 +848,7 @@ <h1>How to rebuild from update hook</h1>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>How to recover a corrupted blob object</h1>
-<span id="revdate">2024-03-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -881,7 +881,7 @@ <h1>How to recover a corrupted blob object</h1>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>How to recover an object from scratch</h1>
-<span id="revdate">2024-03-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -1190,7 +1190,7 @@ <h2 id="_the_adventure_continues_8230">The adventure continues&#8230;</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>