Autogenerated HTML docs for v2.44.0-448-gc2cbf

author: Junio C Hamano <gitster@pobox.com> 2024-04-01 14:11:43 -0700
committer: Junio C Hamano <gitster@pobox.com> 2024-04-01 14:11:43 -0700
commit: e99011429084c5e70c58031325f78a5d4b077a12 (patch)
tree: d92fea37aaa573a86a34019caca766a17213a156
parent: c416a71a462b776d9f3924af7dbfda8bd4f87bdf (diff)
download: git-htmldocs-e99011429084c5e70c58031325f78a5d4b077a12.tar.gz
49 files changed, 129 insertions, 91 deletions
diff --git a/MyFirstContribution.html b/MyFirstContribution.html
index dae31e748..156628405 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html
index 889fdfd24..58996e16b 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/RelNotes/2.45.0.txt b/RelNotes/2.45.0.txt
index cabdaf48b..c73354f6c 100644
--- a/RelNotes/2.45.0.txt
+++ b/RelNotes/2.45.0.txt
@@ -57,6 +57,9 @@ UI, Workflows & Features
  * Remove an ancient and not well maintained Hg-to-git migration
    script from contrib/.
 
+ * Hints that suggest what to do after resolving conflicts can now be
+   squelched by disabling advice.mergeConflict.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -111,6 +114,10 @@ Performance, Internal Implementation, Development Support etc.
  * A new fuzz target that exercises config parsing code has been
    added.
 
+ * Fix the way recently added tests interpolate variables defined
+   outside them, and document the best practice to help future
+   developers.
+
 
 Fixes since v2.44
 -----------------
@@ -244,6 +251,25 @@ Fixes since v2.44
    updated.
    (merge bff85a338c bl/doc-key-val-sep-fix later to maint).
 
+ * "git checkout --conflict=bad" reported a bad conflictStyle as if it
+   were given to a configuration variable; it has been corrected to
+   report that the command line option is bad.
+   (merge 5a99c1ac1a pw/checkout-conflict-errorfix later to maint).
+
+ * Code clean-up in the "git log" machinery that implements custom log
+   message formatting.
+   (merge 1c10b8e5b0 jk/pretty-subject-cleanup later to maint).
+
+ * "git config" corrupted literal HT characters written in the
+   configuration file as part of a value, which has been corrected.
+   (merge e6895c3f97 ds/config-internal-whitespace-fix later to maint).
+
+ * A unit test for reftable code tried to enumerate all files in a
+   directory after reftable operations and expected to see nothing but
+   the files it wanted to leave there, but was fooled by .nfs* cruft
+   files left, which has been corrected.
+   (merge 0068aa7946 ps/reftable-unit-test-nfs-workaround later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge f0e578c69c rs/use-xstrncmpz later to maint).
    (merge 83e6eb7d7a ba/credential-test-clean-fix later to maint).
diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html
index 263681834..f0568c3fb 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/SubmittingPatches.html b/SubmittingPatches.html
index a3bf5da63..4d43c6dea 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/ToolsForGit.html b/ToolsForGit.html
index 7a82ae560..150fef2d1 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/config.txt b/config.txt
index 782c2bab9..70b448b13 100644
--- a/config.txt
+++ b/config.txt
@@ -22,9 +22,10 @@ multivalued.
 Syntax
 ~~~~~~
 
-The syntax is fairly flexible and permissive; whitespaces are mostly
-ignored.  The '#' and ';' characters begin comments to the end of line,
-blank lines are ignored.
+The syntax is fairly flexible and permissive.  Whitespace characters,
+which in this context are the space character (SP) and the horizontal
+tabulation (HT), are mostly ignored.  The '#' and ';' characters begin
+comments to the end of line.  Blank lines are ignored.
 
 The file consists of sections and variables.  A section begins with
 the name of the section in square brackets and continues until the next
@@ -63,16 +64,17 @@ the variable is the boolean "true").
 The variable names are case-insensitive, allow only alphanumeric characters
 and `-`, and must start with an alphabetic character.
 
-A line that defines a value can be continued to the next line by
-ending it with a `\`; the backslash and the end-of-line are
-stripped.  Leading whitespaces after 'name =', the remainder of the
-line after the first comment character '#' or ';', and trailing
-whitespaces of the line are discarded unless they are enclosed in
-double quotes.  Internal whitespaces within the value are retained
-verbatim.
-
-Inside double quotes, double quote `"` and backslash `\` characters
-must be escaped: use `\"` for `"` and `\\` for `\`.
+Whitespace characters surrounding `name`, `=` and `value` are discarded.
+Internal whitespace characters within 'value' are retained verbatim.
+Comments starting with either `#` or `;` and extending to the end of line
+are discarded.  A line that defines a value can be continued to the next
+line by ending it with a backslash (`\`);  the backslash and the end-of-line
+characters are discarded.
+
+If `value` needs to contain leading or trailing whitespace characters,
+it must be enclosed in double quotation marks (`"`).  Inside double quotation
+marks, double quote (`"`) and backslash (`\`) characters must be escaped:
+use `\"` for `"` and `\\` for `\`.
 
 The following escape sequences (beside `\"` and `\\`) are recognized:
 `\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB)
diff --git a/everyday.html b/everyday.html
index e889bef08..7ae962429 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/git-config.html b/git-config.html
index 3c638629a..8431ba803 100644
--- a/git-config.html
+++ b/git-config.html
@@ -1588,9 +1588,10 @@ variables may appear multiple times; we say then that the variable is
 multivalued.</p></div>
 <div class="sect2">
 <h3 id="_syntax">Syntax</h3>
-<div class="paragraph"><p>The syntax is fairly flexible and permissive; whitespaces are mostly
-ignored.  The <em>#</em> and <em>;</em> characters begin comments to the end of line,
-blank lines are ignored.</p></div>
+<div class="paragraph"><p>The syntax is fairly flexible and permissive.  Whitespace characters,
+which in this context are the space character (SP) and the horizontal
+tabulation (HT), are mostly ignored.  The <em>#</em> and <em>;</em> characters begin
+comments to the end of line.  Blank lines are ignored.</p></div>
 <div class="paragraph"><p>The file consists of sections and variables.  A section begins with
 the name of the section in square brackets and continues until the next
 section begins.  Section names are case-insensitive.  Only alphanumeric
@@ -1622,15 +1623,16 @@ header) are recognized as setting variables, in the form
 the variable is the boolean "true").
 The variable names are case-insensitive, allow only alphanumeric characters
 and <code>-</code>, and must start with an alphabetic character.</p></div>
-<div class="paragraph"><p>A line that defines a value can be continued to the next line by
-ending it with a <code>\</code>; the backslash and the end-of-line are
-stripped.  Leading whitespaces after <em>name =</em>, the remainder of the
-line after the first comment character <em>#</em> or <em>;</em>, and trailing
-whitespaces of the line are discarded unless they are enclosed in
-double quotes.  Internal whitespaces within the value are retained
-verbatim.</p></div>
-<div class="paragraph"><p>Inside double quotes, double quote <code>"</code> and backslash <code>\</code> characters
-must be escaped: use <code>\"</code> for <code>"</code> and <code>\\</code> for <code>\</code>.</p></div>
+<div class="paragraph"><p>Whitespace characters surrounding <code>name</code>, <code>=</code> and <code>value</code> are discarded.
+Internal whitespace characters within <em>value</em> are retained verbatim.
+Comments starting with either <code>#</code> or <code>;</code> and extending to the end of line
+are discarded.  A line that defines a value can be continued to the next
+line by ending it with a backslash (<code>\</code>);  the backslash and the end-of-line
+characters are discarded.</p></div>
+<div class="paragraph"><p>If <code>value</code> needs to contain leading or trailing whitespace characters,
+it must be enclosed in double quotation marks (<code>"</code>).  Inside double quotation
+marks, double quote (<code>"</code>) and backslash (<code>\</code>) characters must be escaped:
+use <code>\"</code> for <code>"</code> and <code>\\</code> for <code>\</code>.</p></div>
 <div class="paragraph"><p>The following escape sequences (beside <code>\"</code> and <code>\\</code>) are recognized:
 <code>\n</code> for newline character (NL), <code>\t</code> for horizontal tabulation (HT, TAB)
 and <code>\b</code> for backspace (BS).  Other char escape sequences (including octal
@@ -2148,6 +2150,14 @@ implicitIdentity
 </p>
 </dd>
 <dt class="hdlist1">
+mergeConflict
+</dt>
+<dd>
+<p>
+                Shown when various commands stop because of conflicts.
+</p>
+</dd>
+<dt class="hdlist1">
 nestedTag
 </dt>
 <dd>
diff --git a/git-remote-helpers.html b/git-remote-helpers.html
index 877728df1..90f5fb0c4 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/gitremote-helpers.html b/gitremote-helpers.html
index 36f36fb41..83b6fa659 100644
--- a/gitremote-helpers.html
+++ b/gitremote-helpers.html
@@ -1369,7 +1369,7 @@ set by Git if the remote helper has the <em>option</em> capability.</p></div>
 </p>
 </dd>
 <dt class="hdlist1">
-'option deepen-since &lt;timestamp&gt;
+<em>option deepen-since</em> &lt;timestamp&gt;
 </dt>
 <dd>
 <p>
@@ -1377,7 +1377,7 @@ set by Git if the remote helper has the <em>option</em> capability.</p></div>
 </p>
 </dd>
 <dt class="hdlist1">
-'option deepen-not &lt;ref&gt;
+<em>option deepen-not</em> &lt;ref&gt;
 </dt>
 <dd>
 <p>
@@ -1386,7 +1386,7 @@ set by Git if the remote helper has the <em>option</em> capability.</p></div>
 </p>
 </dd>
 <dt class="hdlist1">
-<em>option deepen-relative {'true</em>|<em>false</em>}
+<em>option deepen-relative</em> {<em>true</em>|<em>false</em>}
 </dt>
 <dd>
 <p>
@@ -1537,7 +1537,7 @@ the remote side using that algorithm.</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2024-03-18 13:11:00 PDT
+ 2024-04-01 14:10:09 PDT
 </div>
 </div>
 </body>
diff --git a/gitremote-helpers.txt b/gitremote-helpers.txt
index 07c8439a6..fcb633e71 100644
--- a/gitremote-helpers.txt
+++ b/gitremote-helpers.txt
@@ -479,14 +479,14 @@ set by Git if the remote helper has the 'option' capability.
 'option depth' <depth>::
 	Deepens the history of a shallow repository.
 
-'option deepen-since <timestamp>::
+'option deepen-since' <timestamp>::
 	Deepens the history of a shallow repository based on time.
 
-'option deepen-not <ref>::
+'option deepen-not' <ref>::
 	Deepens the history of a shallow repository excluding ref.
 	Multiple options add up.
 
-'option deepen-relative {'true'|'false'}::
+'option deepen-relative' {'true'|'false'}::
 	Deepens the history of a shallow repository relative to
 	current boundary. Only valid when used with "option depth".
 
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 88ffc5284..ab79aeae1 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-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 2e7dcd4a3..4829ed4f1 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 5fefcaeb1..2fe61ff6d 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>
diff --git a/howto/new-command.html b/howto/new-command.html
index aee5b1c95..8c9c55c26 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:31 PDT
+ 2024-04-01 14:10:32 PDT
 </div>
 </div>
 </body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index de8b32b4e..4cef4887b 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 4ddbf1adb..a896422c4 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index d80d64773..7b7fa3125 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index fcf261acf..5f2741527 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 5be923201..2e278fd55 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 0d13271ac..b807cf8b4 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:31 PDT
+ 2024-04-01 14:10:32 PDT
 </div>
 </div>
 </body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 54d5549de..d70e325b2 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 90574658c..16f707381 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:32 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 7cf7bca89..784137230 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:31 PDT
+ 2024-04-01 14:10:33 PDT
 </div>
 </div>
 </body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index c1f693278..fad7ddba2 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:31 PDT
+ 2024-04-01 14:10:32 PDT
 </div>
 </div>
 </body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 413ffd327..99717badf 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:31 PDT
+ 2024-04-01 14:10:32 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 0aa688db0..8da45dba8 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-28</span>
+<span id="revdate">2024-04-01</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-28 14:36:31 PDT
+ 2024-04-01 14:10:32 PDT
 </div>
 </div>
 </body>
diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html
index 4d6ece189..a7b1bd63b 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/api-index.html b/technical/api-index.html
index 4e4b5091d..985ab6977 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/api-merge.html b/technical/api-merge.html
index 574078857..d4f1ad13e 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html
index b859d6ff0..9f7509c15 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/api-simple-ipc.html b/technical/api-simple-ipc.html
index d9231616d..e62a6fea5 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/api-trace2.html b/technical/api-trace2.html
index 403972942..5f0a76986 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/bitmap-format.html b/technical/bitmap-format.html
index f1c232ef8..fc33d587d 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html
index e2cabcea2..3d5241fe5 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html
index bc80c0652..87986876b 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-28</span>
+<span id="revdate">2024-04-01</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 27b7b4800..aac1b0d9d 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html
index dbc2bab62..223dfd50e 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/pack-heuristics.html b/technical/pack-heuristics.html
index 813916f88..c75cfa460 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/parallel-checkout.html b/technical/parallel-checkout.html
index 04c7a0b8d..d63c145ba 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/partial-clone.html b/technical/partial-clone.html
index e0950d7de..d0509a9cc 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/racy-git.html b/technical/racy-git.html
index 2aab0de92..96f234d81 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/technical/scalar.html b/technical/scalar.html
index 27e339101..adbaa8a02 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/send-pack-pipeline.html b/technical/send-pack-pipeline.html
index 0f3e52f82..731008b17 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div class="sect1">
diff --git a/technical/shallow.html b/technical/shallow.html
index 4a146f7b0..0e0fbf881 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html
index d90a7a5e8..c10a036d2 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/technical/unit-tests.html b/technical/unit-tests.html
index 82919d296..6c8edb840 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-28</span>
+<span id="revdate">2024-04-01</span>
 </div>
 <div id="content">
 <div id="preamble">
diff --git a/user-manual.html b/user-manual.html
index 4e3389347..66492fea2 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-28</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-04-01</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-04-01 14:11:43 -0700
committer	Junio C Hamano <gitster@pobox.com>	2024-04-01 14:11:43 -0700
commit	e99011429084c5e70c58031325f78a5d4b077a12 (patch)
tree	d92fea37aaa573a86a34019caca766a17213a156
parent	c416a71a462b776d9f3924af7dbfda8bd4f87bdf (diff)
download	git-htmldocs-e99011429084c5e70c58031325f78a5d4b077a12.tar.gz