Autogenerated HTML docs for v1.7.5.1-169-g505a1

1 files changed, 30 insertions, 22 deletions

diff --git a/git-merge-base.html b/git-merge-base.html
index a2c696bbd..ef643176b 100644
--- a/git-merge-base.html
+++ b/git-merge-base.html
@@ -415,7 +415,8 @@ git-merge-base(1) Manual Page
 <h2 id="_synopsis">SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<div class="verseblock-content"><em>git merge-base</em> [-a|--all] [--octopus] &lt;commit&gt; &lt;commit&gt;&#8230;

+<div class="verseblock-content"><em>git merge-base</em> [-a|--all] &lt;commit&gt; &lt;commit&gt;&#8230;

+<em>git merge-base</em> [-a|--all] --octopus &lt;commit&gt;&#8230;

 <em>git merge-base</em> --independent &lt;commit&gt;&#8230;</div>

 <div class="verseblock-attribution">

 </div></div>

@@ -428,31 +429,20 @@ 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

 ancestor</em>, i.e. a <em>merge base</em>.  Note that there can be more than one

 merge base for a pair of commits.</p></div>

-<div class="paragraph"><p>Unless <tt>--octopus</tt> is given, among the two commits to compute the merge

-base from, one is specified by the first commit argument on the command

-line; the other commit is a (possibly hypothetical) commit that is a merge

-across all the remaining commits on the command line.  As 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>

+<h2 id="_operation_mode">OPERATION MODE</h2>

+<div class="sectionbody">

+<div class="paragraph"><p>As 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;

+the other commit is a (possibly hypothetical) commit that is a merge

+across all the remaining commits on the command line.</p></div>

 <div class="paragraph"><p>As a consequence, the <em>merge base</em> is not necessarily contained in each of the

 commit arguments if more than two commits are specified. This is different

 from <a href="git-show-branch.html">git-show-branch(1)</a> when used with the <tt>--merge-base</tt> option.</p></div>

-</div>

-<h2 id="_options">OPTIONS</h2>

-<div class="sectionbody">

 <div class="dlist"><dl>

 <dt class="hdlist1">

--a

-</dt>

-<dt class="hdlist1">

---all

-</dt>

-<dd>

-<p>

-        Output all merge bases for the commits, instead of just one.

-</p>

-</dd>

-<dt class="hdlist1">

 --octopus

 </dt>

 <dd>

@@ -476,6 +466,22 @@ from <a href="git-show-branch.html">git-show-branch(1)</a> when used with the <t
 </dd>

 </dl></div>

 </div>

+<h2 id="_options">OPTIONS</h2>

+<div class="sectionbody">

+<div class="dlist"><dl>

+<dt class="hdlist1">

+-a

+</dt>

+<dt class="hdlist1">

+--all

+</dt>

+<dd>

+<p>

+        Output all merge bases for the commits, instead of just one.

+</p>

+</dd>

+</dl></div>

+</div>

 <h2 id="_discussion">DISCUSSION</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>Given two commits <em>A</em> and <em>B</em>, <tt>git merge-base A B</tt> will output a commit

@@ -512,6 +518,8 @@ equivalent topology with a merge commit <em>M</em> between <em>B</em> and <em>C<
 <div class="paragraph"><p>and the result of <tt>git merge-base A M</tt> is <em>1</em>.  Commit <em>2</em> is also a

 common ancestor between <em>A</em> and <em>M</em>, but <em>1</em> is a better common ancestor,

 because <em>2</em> is an ancestor of <em>1</em>.  Hence, <em>2</em> is not a merge base.</p></div>

+<div class="paragraph"><p>The result of <tt>git merge-base --octopus A B C</tt> is <em>2</em>, because <em>2</em> is

+the best common ancestor of all commits.</p></div>

 <div class="paragraph"><p>When the history involves criss-cross merges, there can be more than one

 <em>best</em> common ancestor for two commits.  For example, with this topology:</p></div>

 <div class="literalblock">

@@ -538,7 +546,7 @@ it is unspecified which best one is output.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-03-15 23:30:14 UTC

+Last updated 2011-05-05 01:29:54 UTC

 </div>

 </div>

 </body>