Autogenerated HTML docs for v1.6.4-53-g3f55e

1 files changed, 9 insertions, 3 deletions

diff --git a/git-merge-base.html b/git-merge-base.html
index 19ce892c2..37f9f4746 100644
--- a/git-merge-base.html
+++ b/git-merge-base.html
@@ -320,11 +320,11 @@ git-merge-base(1) Manual Page
 </div>

 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

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

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

 </div>

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

 <div class="sectionbody">

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

+<div class="para"><p><em>git merge-base</em> finds 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

@@ -336,11 +336,17 @@ the first commit argument on the command line; the other commit is a
 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>

 </div>

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

 <div class="sectionbody">

 <div class="vlist"><dl>

 <dt>

+-a

+</dt>

+<dt>

 --all

 </dt>

 <dd>

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-07-01 02:30:55 UTC

+Last updated 2009-08-05 21:21:15 UTC

 </div>

 </div>

 </body>