Autogenerated HTML docs for v2.44.0-53-g0f9d4

git · Feb 28, 2024 · cd35a3e · cd35a3e
1 parent 69787bb
commit cd35a3e
Show file tree

Hide file tree

Showing 49 changed files with 109 additions and 75 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-02-26</span>
+<span id="revdate">2024-02-27</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-02-26</span>
+<span id="revdate">2024-02-27</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/RelNotes/2.45.0.txt b/RelNotes/2.45.0.txt
@@ -12,6 +12,9 @@ UI, Workflows & Features
  * "git checkout -p" and friends learned that that "@" is a synonym
    for "HEAD".
 
+ * Variants of vimdiff learned to honor mergetool.<variant>.layout
+   settings.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -21,6 +24,9 @@ Performance, Internal Implementation, Development Support etc.
  * More tests that are marked as "ref-files only" have been updated to
    improve test coverage of reftable backend.
 
+ * Some parts of command line completion script (in contrib/) have
+   been micro-optimized.
+
 
 Fixes since v2.44
 -----------------
@@ -36,5 +42,20 @@ Fixes since v2.44
    it would lead to nonsense behaviour including division by zero.
    (merge 76fb807faa kh/column-reject-negative-padding later to maint).
 
+ * "git am --help" now tells readers what actions are available in
+   "git am --whitespace=<action>", in addition to saying that the
+   option is passed through to the underlying "git apply".
+   (merge a171dac734 jc/am-whitespace-doc later to maint).
+
+ * "git tag --column" failed to check the exit status of its "git
+   column" invocation, which has been corrected.
+   (merge 92e66478fc rj/tag-column-fix later to maint).
+
+ * Credential helper based on libsecret (in contrib/) has been updated
+   to handle an empty password correctly.
+   (merge 8f1f2023b7 mh/libsecret-empty-password-fix 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).
+   (merge 64562d784d jb/doc-interactive-singlekey-do-not-need-perl 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-02-26</span>
+<span id="revdate">2024-02-27</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-02-26</span>
+<span id="revdate">2024-02-27</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-02-26</span>
+<span id="revdate">2024-02-27</span>
 </div>
 <div id="content">
 <div class="sect1">

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-02-26</span>
+<span id="revdate">2024-02-27</span>
 </div>
 <div id="content">
 <div id="preamble">

diff --git a/git-am.html b/git-am.html
@@ -1001,6 +1001,8 @@ <h2 id="_options">OPTIONS</h2>
         program that applies
         the patch.
 </p>
+<div class="paragraph"><p>Valid &lt;action&gt; for the <code>--whitespace</code> option are:
+<code>nowarn</code>, <code>warn</code>, <code>fix</code>, <code>error</code>, and <code>error-all</code>.</p></div>
 </dd>
 <dt class="hdlist1">
 --patch-format
@@ -1289,7 +1291,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-29 16:42:00 PDT
+ 2024-02-27 16:31:29 PST
 </div>
 </div>
 </body>

diff --git a/git-am.txt b/git-am.txt
@@ -128,6 +128,9 @@ include::rerere-options.txt[]
 	These flags are passed to the 'git apply' (see linkgit:git-apply[1])
 	program that applies
 	the patch.
++
+Valid <action> for the `--whitespace` option are:
+`nowarn`, `warn`, `fix`, `error`, and `error-all`.
 
 --patch-format::
 	By default the command will try to detect the patch format

diff --git a/git-config.html b/git-config.html
@@ -7921,9 +7921,7 @@ <h3 id="_variables">Variables</h3>
         Currently this is used by the <code>--patch</code> mode of
         <a href="git-add.html">git-add(1)</a>, <a href="git-checkout.html">git-checkout(1)</a>,
         <a href="git-restore.html">git-restore(1)</a>, <a href="git-commit.html">git-commit(1)</a>,
-        <a href="git-reset.html">git-reset(1)</a>, and <a href="git-stash.html">git-stash(1)</a>. Note that this
-        setting is silently ignored if portable keystroke input
-        is not available; requires the Perl module Term::ReadKey.
+        <a href="git-reset.html">git-reset(1)</a>, and <a href="git-stash.html">git-stash(1)</a>.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -8827,15 +8825,19 @@ <h3 id="_variables">Variables</h3>
 </p>
 </dd>
 <dt class="hdlist1">
-mergetool.vimdiff.layout
+mergetool.&lt;vimdiff variant&gt;.layout
 </dt>
 <dd>
 <p>
-        The vimdiff backend uses this variable to control how its split
-        windows appear. Applies even if you are using Neovim (<code>nvim</code>) or
-        gVim (<code>gvim</code>) as the merge tool. See BACKEND SPECIFIC HINTS section
-        in <a href="git-mergetool.html">git-mergetool(1)</a>.
-        for details.
+        Configure the split window layout for vimdiff&#8217;s <code>&lt;variant&gt;</code>, which is any of <code>vimdiff</code>,
+        <code>nvimdiff</code>, <code>gvimdiff</code>.
+        Upon launching <code>git mergetool</code> with <code>--tool=&lt;variant&gt;</code> (or without <code>--tool</code>
+        if <code>merge.tool</code> is configured as <code>&lt;variant&gt;</code>), Git will consult
+        <code>mergetool.&lt;variant&gt;.layout</code> to determine the tool&#8217;s layout. If the
+        variant-specific configuration is not available, <code>vimdiff</code>'s is used as
+        fallback.  If that too is not available, a default layout with 4 windows
+        will be used.  To configure the layout, see the <code>BACKEND SPECIFIC HINTS</code>
+        section in <a href="git-mergetool.html">git-mergetool(1)</a>.
 </p>
 </dd>
 <dt class="hdlist1">

diff --git a/git-mergetool.html b/git-mergetool.html
@@ -970,14 +970,19 @@ <h2 id="_configuration">CONFIGURATION</h2>
 </p>
 </dd>
 <dt class="hdlist1">
-mergetool.vimdiff.layout
+mergetool.&lt;vimdiff variant&gt;.layout
 </dt>
 <dd>
 <p>
-        The vimdiff backend uses this variable to control how its split
-        windows appear. Applies even if you are using Neovim (<code>nvim</code>) or
-        gVim (<code>gvim</code>) as the merge tool. See BACKEND SPECIFIC HINTS section
-        for details.
+        Configure the split window layout for vimdiff&#8217;s <code>&lt;variant&gt;</code>, which is any of <code>vimdiff</code>,
+        <code>nvimdiff</code>, <code>gvimdiff</code>.
+        Upon launching <code>git mergetool</code> with <code>--tool=&lt;variant&gt;</code> (or without <code>--tool</code>
+        if <code>merge.tool</code> is configured as <code>&lt;variant&gt;</code>), Git will consult
+        <code>mergetool.&lt;variant&gt;.layout</code> to determine the tool&#8217;s layout. If the
+        variant-specific configuration is not available, <code>vimdiff</code>'s is used as
+        fallback.  If that too is not available, a default layout with 4 windows
+        will be used.  To configure the layout, see the <code>BACKEND SPECIFIC HINTS</code>
+        section.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -1301,7 +1306,8 @@ <h4 id="_variants">Variants</h4>
 </ul></div>
 <div class="paragraph"><p>When using these variants, in order to specify a custom layout you will have to
 set configuration variables <code>mergetool.gvimdiff.layout</code> and
-<code>mergetool.nvimdiff.layout</code> instead of <code>mergetool.vimdiff.layout</code></p></div>
+<code>mergetool.nvimdiff.layout</code> instead of <code>mergetool.vimdiff.layout</code> (though the
+latter will be used as fallback if the variant-specific one is not set).</p></div>
 <div class="paragraph"><p>In addition, for backwards compatibility with previous Git versions, you can
 also append <code>1</code>, <code>2</code> or <code>3</code> to either <code>vimdiff</code> or any of the variants (ex:
 <code>vimdiff3</code>, <code>nvimdiff1</code>, etc&#8230;) to use a predefined layout.

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-02-26</span>
+<span id="revdate">2024-02-27</span>
 </div>
 <div id="content">
 <div id="preamble">

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-02-26 18:50:08 PST
+ 2024-02-27 16:32:00 PST
 </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-02-26</span>
+<span id="revdate">2024-02-27</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-02-26 18:50:08 PST
+ 2024-02-27 16:32:00 PST
 </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-02-26</span>
+<span id="revdate">2024-02-27</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-02-26 18:50:08 PST
+ 2024-02-27 16:32:00 PST
 </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-02-26</span>
+<span id="revdate">2024-02-27</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-02-26 18:50:06 PST
+ 2024-02-27 16:31:58 PST
 </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-02-26</span>
+<span id="revdate">2024-02-27</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-02-26 18:50:08 PST
+ 2024-02-27 16:31:59 PST
 </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-02-26</span>
+<span id="revdate">2024-02-27</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-02-26 18:50:08 PST
+ 2024-02-27 16:31:59 PST
 </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-02-26</span>
+<span id="revdate">2024-02-27</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-02-26 18:50:08 PST
+ 2024-02-27 16:31:59 PST
 </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-02-26</span>
+<span id="revdate">2024-02-27</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-02-26 18:50:08 PST
+ 2024-02-27 16:31:59 PST
 </div>
 </div>
 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>How to revert a faulty merge</h1>
-<span id="revdate">2024-02-26</span>
+<span id="revdate">2024-02-27</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -1026,7 +1026,7 @@ <h1>How to revert a faulty merge</h1>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-02-26 18:50:07 PST
+ 2024-02-27 16:31:59 PST
 </div>
 </div>
 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>How to revert an existing commit</h1>
-<span id="revdate">2024-02-26</span>
+<span id="revdate">2024-02-27</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -908,7 +908,7 @@ <h1>How to revert an existing commit</h1>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-02-26 18:50:06 PST
+ 2024-02-27 16:31:58 PST
 </div>
 </div>
 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
@@ -735,7 +735,7 @@
 <body class="article">
 <div id="header">
 <h1>How to separate topic branches</h1>
-<span id="revdate">2024-02-26</span>
+<span id="revdate">2024-02-27</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -842,7 +842,7 @@ <h1>How to separate topic branches</h1>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-02-26 18:50:07 PST
+ 2024-02-27 16:31:59 PST
 </div>
 </div>
 </body>