Autogenerated HTML docs for v1.7.2.3-313-gcd15

1 files changed, 38 insertions, 8 deletions

diff --git a/git-merge-base.html b/git-merge-base.html
index 933499250..e72d5ec85 100644
--- a/git-merge-base.html
+++ b/git-merge-base.html
@@ -320,7 +320,9 @@ git-merge-base(1) Manual Page
 </div>

 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

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

+<div class="verseblock">

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

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

 </div>

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

 <div class="sectionbody">

@@ -330,12 +332,12 @@ 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="para"><p>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 class="para"><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 class="para"><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>

@@ -354,6 +356,28 @@ from <a href="git-show-branch.html">git-show-branch(1)</a> when used with the <t
         Output all merge bases for the commits, instead of just one.

 </p>

 </dd>

+<dt>

+--octopus

+</dt>

+<dd>

+<p>

+        Compute the best common ancestors of all supplied commits,

+        in preparation for an n-way merge.  This mimics the behavior

+        of <em>git show-branch --merge-base</em>.

+</p>

+</dd>

+<dt>

+--independent

+</dt>

+<dd>

+<p>

+        Instead of printing merge bases, print a minimal subset of

+        the supplied commits with the same ancestors.  In other words,

+        among the commits given, list those which cannot be reached

+        from any other.  This mimics the behavior of <em>git show-branch

+        --independent</em>.

+</p>

+</dd>

 </dl></div>

 </div>

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

@@ -414,13 +438,19 @@ it is unspecified which best one is output.</p></div>
 <div class="sectionbody">

 <div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p></div>

 </div>

+<h2 id="_see_also">See also</h2>

+<div class="sectionbody">

+<div class="para"><p><a href="git-rev-list.html">git-rev-list(1)</a>,

+<a href="git-show-branch.html">git-show-branch(1)</a>,

+<a href="git-merge.html">git-merge(1)</a></p></div>

+</div>

 <h2 id="_git">GIT</h2>

 <div class="sectionbody">

 <div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>

 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-07-21 21:55:28 UTC

+Last updated 2010-09-03 21:30:23 UTC

 </div>

 </div>

 </body>