Autogenerated HTML docs for v2.42.0-482-g2e8e7

1 files changed, 7 insertions, 7 deletions

diff --git a/git-merge-base.html b/git-merge-base.html
index 2dd37db5a..e86337efa 100644
--- a/git-merge-base.html
+++ b/git-merge-base.html
@@ -761,7 +761,7 @@ git-merge-base(1) Manual Page
 <div class="sect1">

 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

-<div class="paragraph"><p><em>git merge-base</em> finds best common ancestor(s) between two commits to use

+<div class="paragraph"><p><em>git merge-base</em> finds the best common ancestor(s) between two commits to use

 in a three-way merge.  One common ancestor is <em>better</em> than another common

 ancestor if the latter is an ancestor of the former.  A common ancestor

 that does not have any better common ancestor is a <em>best common

@@ -772,7 +772,7 @@ merge base for a pair of commits.</p></div>
 <div class="sect1">

 <h2 id="_operation_modes">OPERATION MODES</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>As the most common special case, specifying only two commits on the

+<div class="paragraph"><p>In the most common special case, specifying only two commits on the

 command line means computing the merge base between the given two commits.</p></div>

 <div class="paragraph"><p>More generally, among the two commits to compute the merge base from,

 one is specified by the first commit argument on the command line;

@@ -825,7 +825,7 @@ from <a href="git-show-branch.html">git-show-branch(1)</a> when used with the <c
         the two commits, but also takes into account the reflog of

         &lt;ref&gt; to see if the history leading to &lt;commit&gt; forked from

         an earlier incarnation of the branch &lt;ref&gt; (see discussion

-        on this mode below).

+        of this mode below).

 </p>

 </dd>

 </dl></div>

@@ -862,7 +862,7 @@ which is reachable from both <em>A</em> and <em>B</em> through the parent relati
 ---o---1---o---o---o---A</code></pre>

 </div></div>

 <div class="paragraph"><p>the merge base between <em>A</em> and <em>B</em> is <em>1</em>.</p></div>

-<div class="paragraph"><p>Given three commits <em>A</em>, <em>B</em> and <em>C</em>, <code>git merge-base A B C</code> will compute the

+<div class="paragraph"><p>Given three commits <em>A</em>, <em>B</em>, and <em>C</em>, <code>git merge-base A B C</code> will compute the

 merge base between <em>A</em> and a hypothetical commit <em>M</em>, which is a merge

 between <em>B</em> and <em>C</em>.  For example, with this topology:</p></div>

 <div class="literalblock">

@@ -898,7 +898,7 @@ the best common ancestor of all commits.</p></div>
     / \

 ---2---o---o---B</code></pre>

 </div></div>

-<div class="paragraph"><p>both <em>1</em> and <em>2</em> are merge-bases of A and B.  Neither one is better than

+<div class="paragraph"><p>both <em>1</em> and <em>2</em> are merge bases of A and B.  Neither one is better than

 the other (both are <em>best</em> merge bases).  When the <code>--all</code> option is not given,

 it is unspecified which best one is output.</p></div>

 <div class="paragraph"><p>A common idiom to check "fast-forward-ness" between two commits A

@@ -968,7 +968,7 @@ discarded.</p></div>
 <div class="content">

 <pre><code>$ git rebase --onto origin/master $fork_point topic</code></pre>

 </div></div>

-<div class="paragraph"><p>will replay D0, D1 and D on top of B to create a new history of this

+<div class="paragraph"><p>will replay D0, D1, and D on top of B to create a new history of this

 shape:</p></div>

 <div class="literalblock">

 <div class="content">

@@ -1017,7 +1017,7 @@ commits that used to be at the tip of origin/master).</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-10-28 11:53:56 PDT

+ 2023-10-23 14:43:46 PDT

 </div>

 </div>

 </body>