Autogenerated HTML docs for v2.42.0-482-g2e8e7

author: Junio C Hamano <gitster@pobox.com> 2023-10-23 14:45:54 -0700
committer: Junio C Hamano <gitster@pobox.com> 2023-10-23 14:45:54 -0700
commit: 33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (patch)
tree: 4a681cad5c6da23a7d7f56022666fb31397026d2 /howto
parent: 359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff)
download: git-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz
20 files changed, 43 insertions, 43 deletions
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 8e567fbc6..c9602354a 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -935,7 +935,7 @@ embargoes reasonably short in the interest of keeping Git&#8217;s users safe.</p
 <h3 id="_opening_a_security_advisory_draft">Opening a Security Advisory draft</h3>
 <div class="paragraph"><p>The first step is to <a href="https://github.com/git/git/security/advisories/new">open
 an advisory</a>. Technically, this is not necessary. However, it is the most
-convenient way to obtain the CVE number and it give us a private repository
+convenient way to obtain the CVE number and it gives us a private repository
 associated with it that can be used to collaborate on a fix.</p></div>
 </div>
 <div class="sect2">
@@ -1038,7 +1038,7 @@ Thanks,
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:18 PDT
 </div>
 </div>
 </body>
diff --git a/howto/coordinate-embargoed-releases.txt b/howto/coordinate-embargoed-releases.txt
index e653775ba..b9cb95e82 100644
--- a/howto/coordinate-embargoed-releases.txt
+++ b/howto/coordinate-embargoed-releases.txt
@@ -145,7 +145,7 @@ Opening a Security Advisory draft
 
 The first step is to https://github.com/git/git/security/advisories/new[open
 an advisory]. Technically, this is not necessary. However, it is the most
-convenient way to obtain the CVE number and it give us a private repository
+convenient way to obtain the CVE number and it gives us a private repository
 associated with it that can be used to collaborate on a fix.
 
 Notifying the Linux distributions
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index bf53ccefb..f1d68c7b9 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">2023-10-20</span>
+<span id="revdate">2023-10-23</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
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:18 PDT
 </div>
 </div>
 </body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 2130c1458..010ef9e71 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">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
 </div>
 <div id="content">
 <div class="sect1">
@@ -889,7 +889,7 @@ Scan mailing list.  Respond with review comments, suggestions
 <li>
 <p>
 Write his own patches to address issues raised on the list but
-   nobody has stepped up solving.  Send it out just like other
+   nobody has stepped up to solve.  Send it out just like other
    contributors do, and pick them up just like patches from other
    contributors (see above).
 </p>
@@ -1400,12 +1400,12 @@ Due to the nature of "SQUASH???" fix-ups, if the original author
 <h3 id="_preparing_a_merge_fix">Preparing a "merge-fix"</h3>
 <div class="paragraph"><p>A merge of two topics may not textually conflict but still have
 conflict at the semantic level. A classic example is for one topic
-to rename an variable and all its uses, while another topic adds a
+to rename a variable and all its uses, while another topic adds a
 new use of the variable under its old name. When these two topics
 are merged together, the reference to the variable newly added by
 the latter topic will still use the old name in the result.</p></div>
 <div class="paragraph"><p>The Meta/Reintegrate script that is used by redo-jch and redo-seen
-scripts implements a crude but usable way to work this issue around.
+scripts implements a crude but usable way to work around this issue.
 When the script merges branch $X, it checks if "refs/merge-fix/$X"
 exists, and if so, the effect of it is squashed into the result of
 the mechanical merge.  In other words,</p></div>
@@ -1479,7 +1479,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:18 PDT
 </div>
 </div>
 </body>
diff --git a/howto/maintain-git.txt b/howto/maintain-git.txt
index d07c6d44e..013014bbe 100644
--- a/howto/maintain-git.txt
+++ b/howto/maintain-git.txt
@@ -104,7 +104,7 @@ by doing the following:
    files in mbox format).
 
  - Write his own patches to address issues raised on the list but
-   nobody has stepped up solving.  Send it out just like other
+   nobody has stepped up to solve.  Send it out just like other
    contributors do, and pick them up just like patches from other
    contributors (see above).
 
@@ -411,13 +411,13 @@ Preparing a "merge-fix"
 
 A merge of two topics may not textually conflict but still have
 conflict at the semantic level. A classic example is for one topic
-to rename an variable and all its uses, while another topic adds a
+to rename a variable and all its uses, while another topic adds a
 new use of the variable under its old name. When these two topics
 are merged together, the reference to the variable newly added by
 the latter topic will still use the old name in the result.
 
 The Meta/Reintegrate script that is used by redo-jch and redo-seen
-scripts implements a crude but usable way to work this issue around.
+scripts implements a crude but usable way to work around this issue.
 When the script merges branch $X, it checks if "refs/merge-fix/$X"
 exists, and if so, the effect of it is squashed into the result of
 the mechanical merge.  In other words,
diff --git a/howto/new-command.html b/howto/new-command.html
index 590769881..c02fecbfa 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">2023-10-20</span>
+<span id="revdate">2023-10-23</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
- 2023-10-20 16:57:22 PDT
+ 2023-10-23 14:44:16 PDT
 </div>
 </div>
 </body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index b9f8f4a30..87ce5764c 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">2023-10-20</span>
+<span id="revdate">2023-10-23</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
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:18 PDT
 </div>
 </div>
 </body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 438fbf5ff..2d9debf36 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">2023-10-20</span>
+<span id="revdate">2023-10-23</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
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:18 PDT
 </div>
 </div>
 </body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 35ef2f192..d21b974fe 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">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -881,7 +881,7 @@ thing.</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:17 PDT
 </div>
 </div>
 </body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 2b0e6bb35..085dd5b47 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">2023-10-20</span>
+<span id="revdate">2023-10-23</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
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:17 PDT
 </div>
 </div>
 </body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 6fb687054..ef142dda1 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">2023-10-20</span>
+<span id="revdate">2023-10-23</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
- 2023-10-20 16:57:24 PDT
+ 2023-10-23 14:44:17 PDT
 </div>
 </div>
 </body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index a924200de..5261fcf9d 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">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
 </div>
 <div id="content">
 <div id="preamble">
@@ -908,7 +908,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2023-10-20 16:57:22 PDT
+ 2023-10-23 14:44:16 PDT
 </div>
 </div>
 </body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 093a4ab37..b19f1efa3 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">2023-10-20</span>
+<span id="revdate">2023-10-23</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
- 2023-10-20 16:57:23 PDT
+ 2023-10-23 14:44:17 PDT
 </div>
 </div>
 </body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 4ec4f8339..76a250503 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">2023-10-20</span>
+<span id="revdate">2023-10-23</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
- 2023-10-20 16:57:23 PDT
+ 2023-10-23 14:44:17 PDT
 </div>
 </div>
 </body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index c195955a5..bc9515dc1 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">2023-10-20</span>
+<span id="revdate">2023-10-23</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
- 2023-10-20 16:57:23 PDT
+ 2023-10-23 14:44:17 PDT
 </div>
 </div>
 </body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 63a57cc1d..b14bc7a06 100644
--- a/howto/use-git-daemon.html
+++ b/howto/use-git-daemon.html
@@ -735,13 +735,13 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to use git-daemon</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
 </div>
 <div id="content">
 <div id="preamble">
 <div class="sectionbody">
 <div class="paragraph"><p>Git can be run in inetd mode and in stand alone mode. But all you want is
-let a coworker pull from you, and therefore need to set up a Git server
+to let a coworker pull from you, and therefore need to set up a Git server
 real quick, right?</p></div>
 <div class="paragraph"><p>Note that git-daemon is not really chatty at the moment, especially when
 things do not go according to plan (e.g. a socket could not be bound).</p></div>
@@ -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
- 2023-10-20 16:57:23 PDT
+ 2023-10-23 14:44:16 PDT
 </div>
 </div>
 </body>
diff --git a/howto/use-git-daemon.txt b/howto/use-git-daemon.txt
index 7af2e52cf..2cad9b3ca 100644
--- a/howto/use-git-daemon.txt
+++ b/howto/use-git-daemon.txt
@@ -4,7 +4,7 @@ How to use git-daemon
 =====================
 
 Git can be run in inetd mode and in stand alone mode. But all you want is
-let a coworker pull from you, and therefore need to set up a Git server
+to let a coworker pull from you, and therefore need to set up a Git server
 real quick, right?
 
 Note that git-daemon is not really chatty at the moment, especially when
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index da3548d22..1fb1147dd 100644
--- a/howto/using-merge-subtree.html
+++ b/howto/using-merge-subtree.html
@@ -735,12 +735,12 @@ asciidoc.install();
 <body class="article">
 <div id="header">
 <h1>How to use the subtree merge strategy</h1>
-<span id="revdate">2023-10-20</span>
+<span id="revdate">2023-10-23</span>
 </div>
 <div id="content">
 <div id="preamble">
 <div class="sectionbody">
-<div class="paragraph"><p>There are situations where you want to include contents in your project
+<div class="paragraph"><p>There are situations where you want to include content in your project
 from an independently developed project. You can just pull from the
 other project as long as there are no conflicting paths.</p></div>
 <div class="paragraph"><p>The problematic case is when there are conflicting files. Potential
@@ -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
- 2023-10-20 16:57:23 PDT
+ 2023-10-23 14:44:16 PDT
 </div>
 </div>
 </body>
diff --git a/howto/using-merge-subtree.txt b/howto/using-merge-subtree.txt
index a499a94ac..3bd581ac3 100644
--- a/howto/using-merge-subtree.txt
+++ b/howto/using-merge-subtree.txt
@@ -11,7 +11,7 @@ Message-ID: <BAYC1-PASMTP12374B54BA370A1E1C6E78AE4E0@CEZ.ICE>
 How to use the subtree merge strategy
 =====================================
 
-There are situations where you want to include contents in your project
+There are situations where you want to include content in your project
 from an independently developed project. You can just pull from the
 other project as long as there are no conflicting paths.
 
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index c6f80ddc2..87195c2c1 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">2023-10-20</span>
+<span id="revdate">2023-10-23</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
- 2023-10-20 16:57:23 PDT
+ 2023-10-23 14:44:16 PDT
 </div>
 </div>
 </body>
author	Junio C Hamano <gitster@pobox.com>	2023-10-23 14:45:54 -0700
committer	Junio C Hamano <gitster@pobox.com>	2023-10-23 14:45:54 -0700
commit	33be82183d4cd6dc645f64da1402cf9a3f4cdbf3 (patch)
tree	4a681cad5c6da23a7d7f56022666fb31397026d2 /howto
parent	359f02427091f2c0fcac4eb7651fe5d159b84a54 (diff)
download	git-htmldocs-33be82183d4cd6dc645f64da1402cf9a3f4cdbf3.tar.gz