Autogenerated HTML docs for v2.43.0-283-ga54a8

git · Jan 8, 2024 · 17d8c4c · 17d8c4c
1 parent 07b9e54
commit 17d8c4c
Show file tree

Hide file tree

Showing 47 changed files with 144 additions and 129 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-01-02</span>
+<span id="revdate">2024-01-08</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-01-02</span>
+<span id="revdate">2024-01-08</span>
 </div>
 <div id="content">
 <div class="sect1">

diff --git a/RelNotes/2.44.0.txt b/RelNotes/2.44.0.txt
@@ -142,6 +142,18 @@ Fixes since v2.43
    being rebased when both are in effect at the same time.
    (merge 990adccbdf rj/status-bisect-while-rebase later to maint).
 
+ * "git archive --list extra garbage" silently ignored excess command
+   line parameters, which has been corrected.
+   (merge d6b6cd1393 jc/archive-list-with-extra-args later to maint).
+
+ * "git sparse-checkout set" added default patterns even when the
+   patterns are being fed from the standard input, which has been
+   corrected.
+   (merge 53ded839ae jc/sparse-checkout-set-default-fix later to maint).
+
+ * "git sparse-checkout (add|set) --[no-]cone --end-of-options" did
+   not handle "--end-of-options" correctly after a recent update.
+
  * 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).
@@ -163,3 +175,6 @@ Fixes since v2.43
    (merge a762af3dfd jc/retire-cas-opt-name-constant later to maint).
    (merge de7c27a186 la/trailer-cleanups later to maint).
    (merge d44b517137 jc/orphan-unborn later to maint).
+   (merge 63956c553d ml/doc-merge-updates later to maint).
+   (merge d57c671a51 en/header-cleanup later to maint).
+   (merge 5b7eec4bc5 rs/fast-import-simplify-mempool-allocation 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-01-02</span>
+<span id="revdate">2024-01-08</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-01-02</span>
+<span id="revdate">2024-01-08</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-01-02</span>
+<span id="revdate">2024-01-08</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-01-02</span>
+<span id="revdate">2024-01-08</span>
 </div>
 <div id="content">
 <div id="preamble">

diff --git a/git-merge.html b/git-merge.html
@@ -764,18 +764,18 @@ <h2 id="_description">DESCRIPTION</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Incorporates changes from the named commits (since the time their
 histories diverged from the current branch) into the current
-branch.  This command is used by <em>git pull</em> to incorporate changes
+branch.  This command is used by <code>git pull</code> to incorporate changes
 from another repository and can be used by hand to merge changes
 from one branch into another.</p></div>
 <div class="paragraph"><p>Assume the following history exists and the current branch is
-"<code>master</code>":</p></div>
+<code>master</code>:</p></div>
 <div class="listingblock">
 <div class="content">
 <pre><code>          A---B---C topic
          /
     D---E---F---G master</code></pre>
 </div></div>
-<div class="paragraph"><p>Then "<code>git merge topic</code>" will replay the changes made on the
+<div class="paragraph"><p>Then <code>git merge topic</code> will replay the changes made on the
 <code>topic</code> branch since it diverged from <code>master</code> (i.e., <code>E</code>) until
 its current commit (<code>C</code>) on top of <code>master</code>, and record the result
 in a new commit along with the names of the two parent commits and
@@ -787,18 +787,18 @@ <h2 id="_description">DESCRIPTION</h2>
          /         \
     D---E---F---G---H master</code></pre>
 </div></div>
-<div class="paragraph"><p>The second syntax ("<code>git merge --abort</code>") can only be run after the
-merge has resulted in conflicts. <em>git merge --abort</em> will abort the
-merge process and try to reconstruct the pre-merge state. However,
-if there were uncommitted changes when the merge started (and
-especially if those changes were further modified after the merge
-was started), <em>git merge --abort</em> will in some cases be unable to
-reconstruct the original (pre-merge) changes. Therefore:</p></div>
-<div class="paragraph"><p><strong>Warning</strong>: Running <em>git merge</em> with non-trivial uncommitted changes is
+<div class="paragraph"><p>A merge stops if there&#8217;s a conflict that cannot be resolved
+automatically or if <code>--no-commit</code> was provided when initiating the
+merge. At that point you can run <code>git merge --abort</code> or <code>git merge
+--continue</code>.</p></div>
+<div class="paragraph"><p><code>git merge --abort</code> will abort the merge process and try to reconstruct
+the pre-merge state. However, if there were uncommitted changes when the
+merge started (and especially if those changes were further modified
+after the merge was started), <code>git merge --abort</code> will in some cases be
+unable to reconstruct the original (pre-merge) changes. Therefore:</p></div>
+<div class="paragraph"><p><strong>Warning</strong>: Running <code>git merge</code> with non-trivial uncommitted changes is
 discouraged: while possible, it may leave you in a state that is hard to
 back out of in the case of a conflict.</p></div>
-<div class="paragraph"><p>The third syntax ("<code>git merge --continue</code>") can only be run after the
-merge has resulted in conflicts.</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -1119,8 +1119,8 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 <div class="paragraph"><p>If <code>--log</code> is specified, a shortlog of the commits being merged
 will be appended to the specified message.</p></div>
-<div class="paragraph"><p>The <em>git fmt-merge-msg</em> command can be
-used to give a good default for automated <em>git merge</em>
+<div class="paragraph"><p>The <code>git fmt-merge-msg</code> command can be
+used to give a good default for automated <code>git merge</code>
 invocations. The automated message can include the branch description.</p></div>
 </dd>
 <dt class="hdlist1">
@@ -1186,13 +1186,13 @@ <h2 id="_options">OPTIONS</h2>
         present, apply it to the worktree.
 </p>
 <div class="paragraph"><p>If there were uncommitted worktree changes present when the merge
-started, <em>git merge --abort</em> will in some cases be unable to
+started, <code>git merge --abort</code> will in some cases be unable to
 reconstruct these changes. It is therefore recommended to always
-commit or stash your changes before running <em>git merge</em>.</p></div>
-<div class="paragraph"><p><em>git merge --abort</em> is equivalent to <em>git reset --merge</em> when
+commit or stash your changes before running <code>git merge</code>.</p></div>
+<div class="paragraph"><p><code>git merge --abort</code> is equivalent to <code>git reset --merge</code> when
 <code>MERGE_HEAD</code> is present unless <code>MERGE_AUTOSTASH</code> is also present in
-which case <em>git merge --abort</em> applies the stash entry to the worktree
-whereas <em>git reset --merge</em> will save the stashed changes in the stash
+which case <code>git merge --abort</code> applies the stash entry to the worktree
+whereas <code>git reset --merge</code> will save the stashed changes in the stash
 list.</p></div>
 </dd>
 <dt class="hdlist1">
@@ -1210,8 +1210,8 @@ <h2 id="_options">OPTIONS</h2>
 </dt>
 <dd>
 <p>
-        After a <em>git merge</em> stops due to conflicts you can conclude the
-        merge by running <em>git merge --continue</em> (see "HOW TO RESOLVE
+        After a <code>git merge</code> stops due to conflicts you can conclude the
+        merge by running <code>git merge --continue</code> (see "HOW TO RESOLVE
         CONFLICTS" section below).
 </p>
 </dd>
@@ -1240,24 +1240,24 @@ <h2 id="_pre_merge_checks">PRE-MERGE CHECKS</h2>
 <div class="paragraph"><p>Before applying outside changes, you should get your own work in
 good shape and committed locally, so it will not be clobbered if
 there are conflicts.  See also <a href="git-stash.html">git-stash(1)</a>.
-<em>git pull</em> and <em>git merge</em> will stop without doing anything when
-local uncommitted changes overlap with files that <em>git pull</em>/<em>git
-merge</em> may need to update.</p></div>
+<code>git pull</code> and <code>git merge</code> will stop without doing anything when
+local uncommitted changes overlap with files that <code>git pull</code>/<code>git
+merge</code> may need to update.</p></div>
 <div class="paragraph"><p>To avoid recording unrelated changes in the merge commit,
-<em>git pull</em> and <em>git merge</em> will also abort if there are any changes
+<code>git pull</code> and <code>git merge</code> will also abort if there are any changes
 registered in the index relative to the <code>HEAD</code> commit.  (Special
 narrow exceptions to this rule may exist depending on which merge
 strategy is in use, but generally, the index must match HEAD.)</p></div>
-<div class="paragraph"><p>If all named commits are already ancestors of <code>HEAD</code>, <em>git merge</em>
+<div class="paragraph"><p>If all named commits are already ancestors of <code>HEAD</code>, <code>git merge</code>
 will exit early with the message "Already up to date."</p></div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="_fast_forward_merge">FAST-FORWARD MERGE</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Often the current branch head is an ancestor of the named commit.
-This is the most common case especially when invoked from <em>git
-pull</em>: you are tracking an upstream repository, you have committed
+This is the most common case especially when invoked from <code>git
+pull</code>: you are tracking an upstream repository, you have committed
 no local changes, and now you want to update to a newer upstream
 revision.  In this case, a new commit is not needed to store the
 combined history; instead, the <code>HEAD</code> (along with the index) is
@@ -1381,7 +1381,7 @@ <h2 id="_how_conflicts_are_presented">HOW CONFLICTS ARE PRESENTED</h2>
 Barbie&#8217;s remark on your side.  The only thing you can tell is that your
 side wants to say it is hard and you&#8217;d prefer to go shopping, while the
 other side wants to claim it is easy.</p></div>
-<div class="paragraph"><p>An alternative style can be used by setting the "merge.conflictStyle"
+<div class="paragraph"><p>An alternative style can be used by setting the <code>merge.conflictStyle</code>
 configuration variable to either "diff3" or "zdiff3".  In "diff3"
 style, the above conflict may look like this:</p></div>
 <div class="listingblock">
@@ -1443,10 +1443,10 @@ <h2 id="_how_to_resolve_conflicts">HOW TO RESOLVE CONFLICTS</h2>
 <p>
 Resolve the conflicts.  Git will mark the conflicts in
    the working tree.  Edit the files into shape and
-   <em>git add</em> them to the index.  Use <em>git commit</em> or
-   <em>git merge --continue</em> to seal the deal. The latter command
+   <code>git add</code> them to the index.  Use <code>git commit</code> or
+   <code>git merge --continue</code> to seal the deal. The latter command
    checks whether there is a (interrupted) merge in progress
-   before calling <em>git commit</em>.
+   before calling <code>git commit</code>.
 </p>
 </li>
 </ul></div>
@@ -1797,7 +1797,7 @@ <h2 id="_configuration">CONFIGURATION</h2>
 <dd>
 <p>
         Sets default options for merging into branch &lt;name&gt;. The syntax and
-        supported options are the same as those of <em>git merge</em>, but option
+        supported options are the same as those of <code>git merge</code>, but option
         values containing whitespace characters are currently not supported.
 </p>
 </dd>
@@ -2336,7 +2336,7 @@ <h2 id="_git">GIT</h2>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-12-27 15:50:18 PST
+ 2024-01-08 14:58:46 PST
 </div>
 </div>
 </body>