Autogenerated HTML docs for v2.43.0-121-g624eb9

git · Dec 18, 2023 · 2504711 · 2504711
1 parent 9c919c7
commit 2504711
Show file tree

Hide file tree

Showing 80 changed files with 2,686 additions and 117 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">2023-12-09</span>
+<span id="revdate">2023-12-18</span>
 </div>
 <div id="content">
 <div class="sect1">
@@ -1557,7 +1557,7 @@ <h2 id="howto-ggg">Sending Patches via GitGitGadget</h2>
 the GitHub PR workflow. It allows contributors to open pull requests against its
 mirror of the Git project, and does some magic to turn the PR into a set of
 emails and send them out for you. It also runs the Git continuous integration
-suite for you. It&#8217;s documented at <a href="http://gitgitgadget.github.io">http://gitgitgadget.github.io</a>.</p></div>
+suite for you. It&#8217;s documented at <a href="https://gitgitgadget.github.io/">https://gitgitgadget.github.io/</a>.</p></div>
 <div class="sect2">
 <h3 id="create-fork">Forking <code>git/git</code> on GitHub</h3>
 <div class="paragraph"><p>Before you can send your patch off to be reviewed using GitGitGadget, you will
@@ -2097,7 +2097,7 @@ <h3 id="after-approval">After Review Approval</h3>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-11-06 19:13:08 PST
+ 2023-12-18 14:49:41 PST
 </div>
 </div>
 </body>

diff --git a/MyFirstContribution.txt b/MyFirstContribution.txt
@@ -833,7 +833,7 @@ Johannes Schindelin to make life as a Git contributor easier for those used to
 the GitHub PR workflow. It allows contributors to open pull requests against its
 mirror of the Git project, and does some magic to turn the PR into a set of
 emails and send them out for you. It also runs the Git continuous integration
-suite for you. It's documented at http://gitgitgadget.github.io.
+suite for you. It's documented at https://gitgitgadget.github.io/.
 
 [[create-fork]]
 === Forking `git/git` on GitHub

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">2023-12-09</span>
+<span id="revdate">2023-12-18</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/RelNotes/1.6.2.txt b/RelNotes/1.6.2.txt
@@ -10,7 +10,7 @@ To ease the transition plan, the receiving repository of such a
 push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
-  http://git.or.cz/gitwiki/GitFaq#non-bare
+  https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare
   https://lore.kernel.org/git/[email protected]/
 
 for more details on the reason why this change is needed and the

diff --git a/RelNotes/1.6.3.txt b/RelNotes/1.6.3.txt
@@ -10,7 +10,7 @@ To ease the transition plan, the receiving repository of such a
 push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
-  http://git.or.cz/gitwiki/GitFaq#non-bare
+  https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare
   https://lore.kernel.org/git/[email protected]/
 
 for more details on the reason why this change is needed and the

diff --git a/RelNotes/1.6.4.txt b/RelNotes/1.6.4.txt
@@ -10,7 +10,7 @@ To ease the transition plan, the receiving repository of such a
 push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
-  http://git.or.cz/gitwiki/GitFaq#non-bare
+  https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare
   https://lore.kernel.org/git/[email protected]/
 
 for more details on the reason why this change is needed and the

diff --git a/RelNotes/1.6.5.txt b/RelNotes/1.6.5.txt
@@ -21,7 +21,7 @@ To ease the transition plan, the receiving repository of such a
 push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
-  http://git.or.cz/gitwiki/GitFaq#non-bare
+  https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare
   https://lore.kernel.org/git/[email protected]/
 
 for more details on the reason why this change is needed and the

diff --git a/RelNotes/1.6.6.txt b/RelNotes/1.6.6.txt
@@ -63,7 +63,7 @@ users will fare this time.
 
    Please refer to:
 
-   http://git.or.cz/gitwiki/GitFaq#non-bare
+   https://archive.kernel.org/oldwiki/git.wiki.kernel.org/index.php/GitFaq.html#non-bare
    https://lore.kernel.org/git/[email protected]/
 
    for more details on the reason why this change is needed and the

diff --git a/RelNotes/2.44.0.txt b/RelNotes/2.44.0.txt
@@ -9,6 +9,12 @@ UI, Workflows & Features
  * "git rebase --autosquash" is now enabled for non-interactive rebase,
    but it is still incompatible with the apply backend.
 
+ * Introduce "git replay", a tool meant on the server side without
+   working tree to recreate a history.
+
+ * "git merge-file" learned to take the "--diff-algorithm" option to
+   use algorithm different from the default "myers" diff.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -21,6 +27,11 @@ Performance, Internal Implementation, Development Support etc.
    in an unspecified order, to allow certain optimizations to take
    advantage of.
 
+ * Simplify API implementation to delete references by eliminating
+   duplication.
+
+ * Subject approxidate() and show_date() machinery to OSS-Fuzz.
+
 
 Fixes since v2.43
 -----------------
@@ -40,4 +51,22 @@ Fixes since v2.43
    simplifying our implementation.
    (merge 6ff658cc78 tz/send-email-negatable-options later to maint).
 
+ * Earlier we stopped relying on commit-graph that (still) records
+   information about commits that are lost from the object store,
+   which has negative performance implications.  The default has been
+   flipped to disable this pessimization.
+   (merge b1df3b3867 ps/commit-graph-less-paranoid later to maint).
+
+ * Stale URLs have been updated to their current counterparts (or
+   archive.org) and HTTP links are replaced with working HTTPS links.
+   (merge 62b4f7b9c6 js/update-urls-in-doc-and-comment later to maint).
+
+ * trace2 streams used to record the URLs that potentially embed
+   authentication material, which has been corrected.
+   (merge 16fa3eebc0 jh/trace2-redact-auth later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
+   (merge 50f1abcff6 js/packfile-h-typofix later to maint).
+   (merge cbf498eb53 jb/reflog-expire-delete-dry-run-options later to maint).
+   (merge 7854bf4960 rs/i18n-cannot-be-used-together later to maint).
+   (merge cd3c28c53a rs/column-leakfix 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">2023-12-09</span>
+<span id="revdate">2023-12-18</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">2023-12-09</span>
+<span id="revdate">2023-12-18</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">2023-12-09</span>
+<span id="revdate">2023-12-18</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/cmds-plumbingmanipulators.txt b/cmds-plumbingmanipulators.txt
@@ -40,6 +40,9 @@ linkgit:git-prune-packed[1]::
 linkgit:git-read-tree[1]::
 	Reads tree information into the index.
 
+linkgit:git-replay[1]::
+	EXPERIMENTAL: Replay commits on a new base, works with bare repos too.
+
 linkgit:git-symbolic-ref[1]::
 	Read, modify and delete symbolic refs.
 

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">2023-12-09</span>
+<span id="revdate">2023-12-18</span>
 </div>
 <div id="content">
 <div id="preamble">

diff --git a/git-commit.html b/git-commit.html
@@ -1071,7 +1071,7 @@ <h2 id="_options">OPTIONS</h2>
         the committer has the rights to submit the work under the
         project&#8217;s license or agrees to some contributor representation,
         such as a Developer Certificate of Origin.
-        (See <a href="http://developercertificate.org">http://developercertificate.org</a> for the one used by the
+        (See <a href="https://developercertificate.org">https://developercertificate.org</a> for the one used by the
         Linux kernel and Git projects.)  Consult the documentation or
         leadership of the project to which you&#8217;re contributing to
         understand how the signoffs are used in that project.

diff --git a/git-cvsimport.html b/git-cvsimport.html
@@ -765,7 +765,7 @@ <h2 id="_description">DESCRIPTION</h2>
 deprecated; it does not work with cvsps version 3 and later.  If you are
 performing a one-shot import of a CVS repository consider using
 <a href="http://cvs2svn.tigris.org/cvs2git.html">cvs2git</a> or
-<a href="http://www.catb.org/esr/cvs-fast-export/">cvs-fast-export</a>.</p></div>
+<a href="https://gitlab.com/esr/cvs-fast-export">cvs-fast-export</a>.</p></div>
 <div class="paragraph"><p>Imports a CVS repository into Git. It will either create a new
 repository, or incrementally import into an existing one.</p></div>
 <div class="paragraph"><p>Splitting the CVS log into patch sets is done by <em>cvsps</em>.
@@ -1090,7 +1090,7 @@ <h2 id="issues">ISSUES</h2>
 <div class="ulist"><ul>
 <li>
 <p>
-cvs2git (part of cvs2svn), <code>http://subversion.apache.org/</code>
+cvs2git (part of cvs2svn), <code>https://subversion.apache.org/</code>
 </p>
 </li>
 </ul></div>
@@ -1107,7 +1107,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2021-12-10 14:52:02 PST
+ 2023-12-18 14:49:41 PST
 </div>
 </div>
 </body>

diff --git a/git-cvsimport.txt b/git-cvsimport.txt
@@ -22,7 +22,7 @@ DESCRIPTION
 deprecated; it does not work with cvsps version 3 and later.  If you are
 performing a one-shot import of a CVS repository consider using
 http://cvs2svn.tigris.org/cvs2git.html[cvs2git] or
-http://www.catb.org/esr/cvs-fast-export/[cvs-fast-export].
+https://gitlab.com/esr/cvs-fast-export[cvs-fast-export].
 
 Imports a CVS repository into Git. It will either create a new
 repository, or incrementally import into an existing one.
@@ -221,7 +221,7 @@ Problems related to tags:
 If you suspect that any of these issues may apply to the repository you
 want to import, consider using cvs2git:
 
-* cvs2git (part of cvs2svn), `http://subversion.apache.org/`
+* cvs2git (part of cvs2svn), `https://subversion.apache.org/`
 
 GIT
 ---

diff --git a/git-format-patch.html b/git-format-patch.html
@@ -2391,8 +2391,8 @@ <h4 id="_approach_2_configuration">Approach #2 (configuration)</h4>
 <div class="sect3">
 <h4 id="_approach_3_external_editor">Approach #3 (external editor)</h4>
 <div class="paragraph"><p>The following Thunderbird extensions are needed:
-AboutConfig from <a href="http://aboutconfig.mozdev.org/">http://aboutconfig.mozdev.org/</a> and
-External Editor from <a href="http://globs.org/articles.php?lng=en&amp;pg=8">http://globs.org/articles.php?lng=en&amp;pg=8</a></p></div>
+AboutConfig from <a href="https://mjg.github.io/AboutConfig/">https://mjg.github.io/AboutConfig/</a> and
+External Editor from <a href="https://globs.org/articles.php?lng=en&amp;pg=8">https://globs.org/articles.php?lng=en&amp;pg=8</a></p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
@@ -2618,7 +2618,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-23 14:43:46 PDT
+ 2023-12-18 14:49:41 PST
 </div>
 </div>
 </body>

diff --git a/git-format-patch.txt b/git-format-patch.txt
@@ -610,8 +610,8 @@ Approach #3 (external editor)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The following Thunderbird extensions are needed:
-AboutConfig from http://aboutconfig.mozdev.org/ and
-External Editor from http://globs.org/articles.php?lng=en&pg=8
+AboutConfig from https://mjg.github.io/AboutConfig/ and
+External Editor from https://globs.org/articles.php?lng=en&pg=8
 
 1. Prepare the patch as a text file using your method of choice.
 

diff --git a/git-imap-send.html b/git-imap-send.html
@@ -1008,7 +1008,7 @@ <h2 id="_caution">CAUTION</h2>
 flames ridiculing you if you don&#8217;t check this.</p></div>
 <div class="paragraph"><p>Thunderbird in particular is known to be problematic.  Thunderbird
 users may wish to visit this web page for more information:
-  <a href="http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email">http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email</a></p></div>
+  <a href="https://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email">https://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email</a></p></div>
 </div>
 </div>
 <div class="sect1">
@@ -1028,7 +1028,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2022-09-14 13:23:11 PDT
+ 2023-12-18 14:49:41 PST
 </div>
 </div>
 </body>

diff --git a/git-imap-send.txt b/git-imap-send.txt
@@ -135,7 +135,7 @@ flames ridiculing you if you don't check this.
 
 Thunderbird in particular is known to be problematic.  Thunderbird
 users may wish to visit this web page for more information:
-  http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email
+  https://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email
 
 SEE ALSO
 --------

diff --git a/git-merge-file.html b/git-merge-file.html
@@ -871,6 +871,18 @@ <h2 id="_options">OPTIONS</h2>
         favouring our (or their or both) side of the lines.
 </p>
 </dd>
+<dt class="hdlist1">
+--diff-algorithm={patience|minimal|histogram|myers}
+</dt>
+<dd>
+<p>
+        Use a different diff algorithm while merging. The current default is "myers",
+        but selecting more recent algorithm such as "histogram" can help
+        avoid mismerges that occur due to unimportant matching lines
+        (such as braces from distinct functions). See also
+        <a href="git-diff.html">git-diff(1)</a> <code>--diff-algorithm</code>.
+</p>
+</dd>
 </dl></div>
 </div>
 </div>
@@ -919,7 +931,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-11-08 09:04:31 PST
+ 2023-12-18 14:49:41 PST
 </div>
 </div>
 </body>

diff --git a/git-merge-file.txt b/git-merge-file.txt
@@ -92,6 +92,12 @@ object store and the object ID of its blob is written to standard output.
 	Instead of leaving conflicts in the file, resolve conflicts
 	favouring our (or their or both) side of the lines.
 
+--diff-algorithm={patience|minimal|histogram|myers}::
+	Use a different diff algorithm while merging. The current default is "myers",
+	but selecting more recent algorithm such as "histogram" can help
+	avoid mismerges that occur due to unimportant matching lines
+	(such as braces from distinct functions). See also
+	linkgit:git-diff[1] `--diff-algorithm`.
 
 EXAMPLES
 --------

diff --git a/git-merge.html b/git-merge.html
@@ -935,7 +935,7 @@ <h2 id="_options">OPTIONS</h2>
         the committer has the rights to submit the work under the
         project&#8217;s license or agrees to some contributor representation,
         such as a Developer Certificate of Origin.
-        (See <a href="http://developercertificate.org">http://developercertificate.org</a> for the one used by the
+        (See <a href="https://developercertificate.org">https://developercertificate.org</a> for the one used by the
         Linux kernel and Git projects.)  Consult the documentation or
         leadership of the project to which you&#8217;re contributing to
         understand how the signoffs are used in that project.

diff --git a/git-pull.html b/git-pull.html
@@ -989,7 +989,7 @@ <h3 id="_options_related_to_merging">Options related to merging</h3>
         the committer has the rights to submit the work under the
         project&#8217;s license or agrees to some contributor representation,
         such as a Developer Certificate of Origin.
-        (See <a href="http://developercertificate.org">http://developercertificate.org</a> for the one used by the
+        (See <a href="https://developercertificate.org">https://developercertificate.org</a> for the one used by the
         Linux kernel and Git projects.)  Consult the documentation or
         leadership of the project to which you&#8217;re contributing to
         understand how the signoffs are used in that project.

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">2023-12-09</span>
+<span id="revdate">2023-12-18</span>
 </div>
 <div id="content">
 <div id="preamble">