summaryrefslogtreecommitdiffstats
path: root/git-merge-base.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
commitfce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch)
treeffce2ae419b52786a0e567f4fddaadd89016f62c /git-merge-base.html
parentbb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff)
downloadgit-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-merge-base.html')
-rw-r--r--git-merge-base.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/git-merge-base.html b/git-merge-base.html
index 1723713dd..9c7cc1d48 100644
--- a/git-merge-base.html
+++ b/git-merge-base.html
@@ -272,17 +272,17 @@ git-merge-base(1) Manual Page
</div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-merge-base</em> [--all] &lt;commit&gt; &lt;commit&gt;</p>
+<p><em>git merge-base</em> [--all] &lt;commit&gt; &lt;commit&gt;</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
-<p>"git-merge-base" finds as good a common ancestor as possible between
-the two commits. That is, given two commits A and B <em>git-merge-base A
-B</em> will output a commit which is reachable from both A and B through
+<p><tt>git-merge-base</tt> finds as good a common ancestor as possible between
+the two commits. That is, given two commits A and B, <tt>git merge-base A
+B</tt> will output a commit which is reachable from both A and B through
the parent relationship.</p>
<p>Given a selection of equally good common ancestors it should not be
relied on to decide in any particular way.</p>
-<p>The "git-merge-base" algorithm is still in flux - use the source&#8230;</p>
+<p>The <tt>git-merge-base</tt> algorithm is still in flux - use the source&#8230;</p>
</div>
<h2>OPTIONS</h2>
<div class="sectionbody">
@@ -312,7 +312,7 @@ relied on to decide in any particular way.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:33:52 UTC
+Last updated 02-Jul-2008 03:01:52 UTC
</div>
</div>
</body>