Autogenerated HTML docs for v2.44.0-248-g4f9b7

author: Junio C Hamano <gitster@pobox.com> 2024-03-14 14:22:57 -0700
committer: Junio C Hamano <gitster@pobox.com> 2024-03-14 14:22:57 -0700
commit: 71fdb9c0761c0975be3227fd10216305a55e9603 (patch)
tree: ef2ae82ed5b29567ec19210eb1ab2c2ba06d75ee
parent: b47d9c841ffcd228bc7f676414b2e7086beb1550 (diff)
download: git-htmldocs-71fdb9c0761c0975be3227fd10216305a55e9603.tar.gz
48 files changed, 107 insertions, 67 deletions
diff --git a/MyFirstContribution.html b/MyFirstContribution.html
index 5d5794304..94dd49ff7 100644
--- a/MyFirstContribution.html
+++ b/MyFirstContribution.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>My First Contribution to the Git Project</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html
index 369da93b0..545c403cd 100644
--- a/MyFirstObjectWalk.html
+++ b/MyFirstObjectWalk.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>My First Object Walk</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/RelNotes/2.45.0.txt b/RelNotes/2.45.0.txt
index 2e7593253..b7662931f 100644
--- a/RelNotes/2.45.0.txt
+++ b/RelNotes/2.45.0.txt
@@ -54,6 +54,13 @@ Performance, Internal Implementation, Development Support etc.
    fetching of objects from the promisor remote, which may be handy
    for debugging.
 
+ * The implementation in "git clean" that makes "-n" and "-i" ignore
+   clean.requireForce has been simplified, together with the
+   documentation.
+
+ * The code to iterate over refs with the reftable backend has seen
+   some optimization.
+
 
 Fixes since v2.44
 -----------------
@@ -130,6 +137,31 @@ Fixes since v2.44
  * Make sure failure return from merge_bases_many() is properly caught.
    (merge 25fd20eb44 js/merge-base-with-missing-commit later to maint).
 
+ * FSMonitor client code was confused when FSEvents were given in a
+   different case on a case-insensitive filesystem, which has been
+   corrected.
+   (merge 29c139ce78 jh/fsmonitor-icase-corner-case-fix later to maint).
+
+ * The "core.commentChar" configuration variable only allows an ASCII
+   character, which was not clearly documented, which has been
+   corrected.
+   (merge fb7c556f58 kh/doc-commentchar-is-a-byte later to maint).
+
+ * With release 2.44 we got rid of all uses of test_i18ngrep and there
+   is no in-flight topic that adds a new use of it.  Make a call to
+   test_i18ngrep a hard failure, so that we can remove it at the end
+   of this release cycle.
+   (merge 381a83dfa3 jc/test-i18ngrep later to maint).
+
+ * The command line completion script (in contrib/) learned to
+   complete "git reflog" better.
+   (merge 1284f9cc11 rj/complete-reflog later to maint).
+
+ * The logic to complete the command line arguments to "git worktree"
+   subcommand (in contrib/) has been updated to correctly honor things
+   like "git -C dir" etc.
+   (merge 3574816d98 rj/complete-worktree-paths-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).
diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html
index e6a0ece11..18531a182 100644
--- a/ReviewingGuidelines.html
+++ b/ReviewingGuidelines.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Reviewing Patches in the Git Project</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/SubmittingPatches.html b/SubmittingPatches.html
index 4e68aee89..14c471bf0 100644
--- a/SubmittingPatches.html
+++ b/SubmittingPatches.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Submitting Patches</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/ToolsForGit.html b/ToolsForGit.html
index 46f659fd2..46f52acf4 100644
--- a/ToolsForGit.html
+++ b/ToolsForGit.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Tools for developing Git</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/everyday.html b/everyday.html
index c931df498..69c383cab 100644
--- a/everyday.html
+++ b/everyday.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Everyday Git With 20 Commands Or So</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/git-clean.html b/git-clean.html
index 0e947da77..bfb630935 100644
--- a/git-clean.html
+++ b/git-clean.html
@@ -793,7 +793,7 @@ that match the pathspec are affected.</p></div>
 <p>
         If the Git configuration variable clean.requireForce is not set
         to false, <em>git clean</em> will refuse to delete files or directories
-        unless given -f or -i.  Git will refuse to modify untracked
+        unless given -f.  Git will refuse to modify untracked
         nested git repositories (directories with a .git subdirectory)
         unless a second -f is given.
 </p>
@@ -808,6 +808,8 @@ that match the pathspec are affected.</p></div>
 <p>
         Show what would be done and clean files interactively. See
         &#8220;Interactive mode&#8221; for details.
+        Configuration variable <code>clean.requireForce</code> is ignored, as
+        this mode gives its own safety protection by going interactive.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -819,6 +821,8 @@ that match the pathspec are affected.</p></div>
 <dd>
 <p>
         Don&#8217;t actually remove anything, just show what would be done.
+        Configuration variable <code>clean.requireForce</code> is ignored, as
+        nothing will be deleted anyway.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -968,8 +972,8 @@ clean.requireForce
 </dt>
 <dd>
 <p>
-        A boolean to make git-clean do nothing unless given -f,
-        -i, or -n.  Defaults to true.
+        A boolean to make git-clean refuse to delete files unless -f
+        is given. Defaults to true.
 </p>
 </dd>
 </dl></div>
@@ -992,7 +996,7 @@ clean.requireForce
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-23 14:43:46 PDT
+ 2024-03-14 14:21:27 PDT
 </div>
 </div>
 </body>
diff --git a/git-clean.txt b/git-clean.txt
index 69331e3f0..fd1716541 100644
--- a/git-clean.txt
+++ b/git-clean.txt
@@ -37,7 +37,7 @@ OPTIONS
 --force::
 	If the Git configuration variable clean.requireForce is not set
 	to false, 'git clean' will refuse to delete files or directories
-	unless given -f or -i.  Git will refuse to modify untracked
+	unless given -f.  Git will refuse to modify untracked
 	nested git repositories (directories with a .git subdirectory)
 	unless a second -f is given.
 
@@ -45,10 +45,14 @@ OPTIONS
 --interactive::
 	Show what would be done and clean files interactively. See
 	``Interactive mode'' for details.
+	Configuration variable `clean.requireForce` is ignored, as
+	this mode gives its own safety protection by going interactive.
 
 -n::
 --dry-run::
 	Don't actually remove anything, just show what would be done.
+	Configuration variable `clean.requireForce` is ignored, as
+	nothing will be deleted anyway.
 
 -q::
 --quiet::
diff --git a/git-config.html b/git-config.html
index 1a2dc4c6c..d4d3fd60c 100644
--- a/git-config.html
+++ b/git-config.html
@@ -2851,8 +2851,8 @@ clean.requireForce
 </dt>
 <dd>
 <p>
-        A boolean to make git-clean do nothing unless given -f,
-        -i, or -n.  Defaults to true.
+        A boolean to make git-clean refuse to delete files unless -f
+        is given. Defaults to true.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -4205,7 +4205,7 @@ core.commentChar
 <dd>
 <p>
         Commands such as <code>commit</code> and <code>tag</code> that let you edit
-        messages consider a line that begins with this character
+        messages consider a line that begins with this ASCII character
         commented, and removes them after the editor returns
         (default <em>#</em>).
 </p>
diff --git a/git-remote-helpers.html b/git-remote-helpers.html
index 567cbe963..b3956273e 100644
--- a/git-remote-helpers.html
+++ b/git-remote-helpers.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>git-remote-helpers</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index cbd4b2235..09d594d60 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -1038,7 +1038,7 @@ Thanks,
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:12 PDT
+ 2024-03-14 14:21:50 PDT
 </div>
 </div>
 </body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 1bd38ac46..cc9c77990 100644
--- a/howto/keep-canonical-history-correct.html
+++ b/howto/keep-canonical-history-correct.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Keep authoritative canonical history correct with git pull</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -939,7 +939,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:12 PDT
+ 2024-03-14 14:21:50 PDT
 </div>
 </div>
 </body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index ed5f3a204..6c2338487 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to maintain Git</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div class="sect1">
@@ -1479,7 +1479,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:12 PDT
+ 2024-03-14 14:21:50 PDT
 </div>
 </div>
 </body>
diff --git a/howto/new-command.html b/howto/new-command.html
index c1087a7d4..fa69d4fb7 100644
--- a/howto/new-command.html
+++ b/howto/new-command.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to integrate new subcommands</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -864,7 +864,7 @@ letter [PATCH 0/n].
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:11 PDT
+ 2024-03-14 14:21:49 PDT
 </div>
 </div>
 </body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 8858ddc16..5742ff9e5 100644
--- a/howto/rebase-from-internal-branch.html
+++ b/howto/rebase-from-internal-branch.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to rebase from an internal branch</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -896,7 +896,7 @@ the #1' commit.</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:12 PDT
+ 2024-03-14 14:21:50 PDT
 </div>
 </div>
 </body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index c2edd3f8d..9f9bd7b97 100644
--- a/howto/rebuild-from-update-hook.html
+++ b/howto/rebuild-from-update-hook.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to rebuild from update hook</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -848,7 +848,7 @@ This is still crude and does not protect against simultaneous
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:12 PDT
+ 2024-03-14 14:21:50 PDT
 </div>
 </div>
 </body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 0cc4a979d..87bd8babc 100644
--- a/howto/recover-corrupted-blob-object.html
+++ b/howto/recover-corrupted-blob-object.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to recover a corrupted blob object</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -881,7 +881,7 @@ thing.</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:12 PDT
+ 2024-03-14 14:21:50 PDT
 </div>
 </div>
 </body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 574c457d4..d7e671e55 100644
--- a/howto/recover-corrupted-object-harder.html
+++ b/howto/recover-corrupted-object-harder.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to recover an object from scratch</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -1190,7 +1190,7 @@ int main(int argc, char **argv)
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:12 PDT
+ 2024-03-14 14:21:50 PDT
 </div>
 </div>
 </body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 715f3ae23..94c8aefd7 100644
--- a/howto/revert-a-faulty-merge.html
+++ b/howto/revert-a-faulty-merge.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to revert a faulty merge</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -1026,7 +1026,7 @@ P---o---o---M---x---x---W---x---M2
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:12 PDT
+ 2024-03-14 14:21:49 PDT
 </div>
 </div>
 </body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 0a11ac3c3..59fdd26a0 100644
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to revert an existing commit</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -908,7 +908,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:11 PDT
+ 2024-03-14 14:21:49 PDT
 </div>
 </div>
 </body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index a596371dc..656394d23 100644
--- a/howto/separating-topic-branches.html
+++ b/howto/separating-topic-branches.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to separate topic branches</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -842,7 +842,7 @@ o---o"master"</code></pre>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:12 PDT
+ 2024-03-14 14:21:49 PDT
 </div>
 </div>
 </body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 9624e19fd..2c7e373e1 100644
--- a/howto/setup-git-server-over-http.html
+++ b/howto/setup-git-server-over-http.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to setup Git server over http</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -1072,7 +1072,7 @@ help diagnosing the problem, but removes security checks.</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:12 PDT
+ 2024-03-14 14:21:49 PDT
 </div>
 </div>
 </body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 24e504308..5b9202c5d 100644
--- a/howto/update-hook-example.html
+++ b/howto/update-hook-example.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to use the update hook</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -931,7 +931,7 @@ that JC can make non-fast-forward pushes on it.</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:11 PDT
+ 2024-03-14 14:21:49 PDT
 </div>
 </div>
 </body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index d0fc37ca9..5e8ba5d7f 100644
--- a/howto/use-git-daemon.html
+++ b/howto/use-git-daemon.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to use git-daemon</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -792,7 +792,7 @@ a good practice to put the paths after a "--" separator.</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:11 PDT
+ 2024-03-14 14:21:49 PDT
 </div>
 </div>
 </body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 78a08094a..181cabc30 100644
--- a/howto/using-merge-subtree.html
+++ b/howto/using-merge-subtree.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to use the subtree merge strategy</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -849,7 +849,7 @@ Please note that if the other project merges from you, then it will
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:11 PDT
+ 2024-03-14 14:21:49 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 3de19456e..1dd6260a3 100644
--- a/howto/using-signed-tag-in-pull-request.html
+++ b/howto/using-signed-tag-in-pull-request.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to use a signed tag in pull requests</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -953,7 +953,7 @@ as part of the merge commit.</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-11 15:40:11 PDT
+ 2024-03-14 14:21:49 PDT
 </div>
 </div>
 </body>
diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html
index 7ebc15f99..814be658f 100644
--- a/technical/api-error-handling.html
+++ b/technical/api-error-handling.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Error reporting in git</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/api-index.html b/technical/api-index.html
index 52f5acfb6..c1e6f5da7 100644
--- a/technical/api-index.html
+++ b/technical/api-index.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Git API Documents</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/api-merge.html b/technical/api-merge.html
index bf394b3bb..eaa988ede 100644
--- a/technical/api-merge.html
+++ b/technical/api-merge.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>merge API</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html
index 11f124e19..2f8e2293d 100644
--- a/technical/api-parse-options.html
+++ b/technical/api-parse-options.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>parse-options API</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/api-simple-ipc.html b/technical/api-simple-ipc.html
index 0fce1778e..bccf95420 100644
--- a/technical/api-simple-ipc.html
+++ b/technical/api-simple-ipc.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Simple-IPC API</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/api-trace2.html b/technical/api-trace2.html
index 8823130f3..36ca56a31 100644
--- a/technical/api-trace2.html
+++ b/technical/api-trace2.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Trace2 API</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/bitmap-format.html b/technical/bitmap-format.html
index efbd5995d..bb0656486 100644
--- a/technical/bitmap-format.html
+++ b/technical/bitmap-format.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>GIT bitmap v1 format</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html
index ca974c8c2..f9eb07cc9 100644
--- a/technical/bundle-uri.html
+++ b/technical/bundle-uri.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Bundle URIs</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html
index 2e6777c3d..7b15537b2 100644
--- a/technical/hash-function-transition.html
+++ b/technical/hash-function-transition.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Git hash function transition</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/technical/long-running-process-protocol.html b/technical/long-running-process-protocol.html
index 6d55b8f69..36999cf02 100644
--- a/technical/long-running-process-protocol.html
+++ b/technical/long-running-process-protocol.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Long-running process protocol</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html
index 08cdbb2c0..0e399abd6 100644
--- a/technical/multi-pack-index.html
+++ b/technical/multi-pack-index.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Multi-Pack-Index (MIDX) Design Notes</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/pack-heuristics.html b/technical/pack-heuristics.html
index 792b16dd5..70b7b5008 100644
--- a/technical/pack-heuristics.html
+++ b/technical/pack-heuristics.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Concerning Git&#8217;s Packing Heuristics</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/parallel-checkout.html b/technical/parallel-checkout.html
index 8ca8da52c..a089c6a3b 100644
--- a/technical/parallel-checkout.html
+++ b/technical/parallel-checkout.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Parallel Checkout Design Notes</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/partial-clone.html b/technical/partial-clone.html
index 298e4c0e6..b9f2bedcc 100644
--- a/technical/partial-clone.html
+++ b/technical/partial-clone.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Partial Clone Design Notes</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/racy-git.html b/technical/racy-git.html
index 285d31701..9e80f2b45 100644
--- a/technical/racy-git.html
+++ b/technical/racy-git.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Use of index and Racy Git problem</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/technical/scalar.html b/technical/scalar.html
index 8cff6132e..6a422912a 100644
--- a/technical/scalar.html
+++ b/technical/scalar.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Scalar</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/send-pack-pipeline.html b/technical/send-pack-pipeline.html
index 5fd755c74..698bfefa0 100644
--- a/technical/send-pack-pipeline.html
+++ b/technical/send-pack-pipeline.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Git-send-pack internals</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/technical/shallow.html b/technical/shallow.html
index 968915708..70b132905 100644
--- a/technical/shallow.html
+++ b/technical/shallow.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Shallow commits</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html
index 29187f9e9..7ed677e80 100644
--- a/technical/trivial-merge.html
+++ b/technical/trivial-merge.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Trivial merge rules</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/unit-tests.html b/technical/unit-tests.html
index 95371476d..72eb8796a 100644
--- a/technical/unit-tests.html
+++ b/technical/unit-tests.html
@@ -735,7 +735,7 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>Unit Testing</h1>
-<span id="revdate">2024-03-11</span>
+<span id="revdate">2024-03-14</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/user-manual.html b/user-manual.html
index 160a40be6..d20c41b5c 100644
--- a/user-manual.html
+++ b/user-manual.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User Manual</title><link rel="stylesheet" type="text/css" href="docbook-xsl.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="book"><div class="titlepage"><div><div><h1 class="title"><a name="id-1"></a>Git User Manual</h1></div><div><div class="revhistory"><table style="border-style:solid; width:100%;" summary="Revision History"><tr><th align="left" valign="top" colspan="2"><b>Revision History</b></th></tr><tr><td align="left"></td><td align="left">2024-03-11</td></tr></table></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="preface"><a href="#_introduction">Introduction</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a Git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring Git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-commits-With-given-Content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-With-git">3. Developing with Git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling Git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public Git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a Git repository via the Git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via HTTP</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#how-to-get-a-git-repository-with-minimal-history">How to get a Git repository with minimal history</a></span></dt><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#interactive-rebase">Using interactive rebases</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote-tracking branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How Git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#pitfalls-with-submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level Git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory → index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index → object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database → index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index → working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking Git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git’s source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. Git Glossary</a></span></dt><dd><dl><dt><span class="section"><a href="#git-explained">Git explained</a></span></dt></dl></dd><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt><dd><dl><dt><span class="section"><a href="#todo-list">Todo list</a></span></dt></dl></dd></dl></div><div class="preface"><div class="titlepage"><div><div><h1 class="title"><a name="_introduction"></a>Introduction</h1></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User Manual</title><link rel="stylesheet" type="text/css" href="docbook-xsl.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="book"><div class="titlepage"><div><div><h1 class="title"><a name="id-1"></a>Git User Manual</h1></div><div><div class="revhistory"><table style="border-style:solid; width:100%;" summary="Revision History"><tr><th align="left" valign="top" colspan="2"><b>Revision History</b></th></tr><tr><td align="left"></td><td align="left">2024-03-14</td></tr></table></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="preface"><a href="#_introduction">Introduction</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a Git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring Git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-commits-With-given-Content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-With-git">3. Developing with Git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling Git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public Git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a Git repository via the Git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via HTTP</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#how-to-get-a-git-repository-with-minimal-history">How to get a Git repository with minimal history</a></span></dt><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#interactive-rebase">Using interactive rebases</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote-tracking branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How Git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#pitfalls-with-submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level Git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory → index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index → object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database → index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index → working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking Git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git’s source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. Git Glossary</a></span></dt><dd><dl><dt><span class="section"><a href="#git-explained">Git explained</a></span></dt></dl></dd><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt><dd><dl><dt><span class="section"><a href="#todo-list">Todo list</a></span></dt></dl></dd></dl></div><div class="preface"><div class="titlepage"><div><div><h1 class="title"><a name="_introduction"></a>Introduction</h1></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX
 command-line skills, but no previous knowledge of Git.</p><p><a class="xref" href="#repositories-and-branches" title="Chapter 1. Repositories and Branches">Chapter 1, <i>Repositories and Branches</i></a> and <a class="xref" href="#exploring-git-history" title="Chapter 2. Exploring Git history">Chapter 2, <i>Exploring Git history</i></a> explain how
 to fetch and study a project using git—read these chapters to learn how
 to build and test a particular version of a software project, search for
author	Junio C Hamano <gitster@pobox.com>	2024-03-14 14:22:57 -0700
committer	Junio C Hamano <gitster@pobox.com>	2024-03-14 14:22:57 -0700
commit	71fdb9c0761c0975be3227fd10216305a55e9603 (patch)
tree	ef2ae82ed5b29567ec19210eb1ab2c2ba06d75ee
parent	b47d9c841ffcd228bc7f676414b2e7086beb1550 (diff)
download	git-htmldocs-71fdb9c0761c0975be3227fd10216305a55e9603.tar.gz