summaryrefslogtreecommitdiffstats
path: root/git-merge-base.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-08 11:40:53 -0700
committerJunio C Hamano <gitster@pobox.com>2012-06-08 11:40:53 -0700
commit719b8a3137af7aea177e42a98cdfbb5180a10f33 (patch)
tree0b0aceeacfdab20db87a431a8a95e1388f0d9e19 /git-merge-base.html
parent022bd341a82a08e16719ab8744973feed49e94d3 (diff)
downloadgit-htmldocs-719b8a3137af7aea177e42a98cdfbb5180a10f33.tar.gz
Autogenerated HTML docs for v1.7.11-rc2-2-g02101
Diffstat (limited to 'git-merge-base.html')
-rw-r--r--git-merge-base.html9
1 files changed, 4 insertions, 5 deletions
diff --git a/git-merge-base.html b/git-merge-base.html
index 23eaadfdb..f48f4461c 100644
--- a/git-merge-base.html
+++ b/git-merge-base.html
@@ -608,7 +608,7 @@ 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>
+from when used with the <tt>--merge-base</tt> option.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
--octopus
@@ -704,13 +704,12 @@ it is unspecified which best one is output.</p></div>
</div>
<h2 id="_see_also">See also</h2>
<div class="sectionbody">
-<div class="paragraph"><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 class="paragraph"><p>,
+,</p></div>
</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
+<div class="paragraph"><p>Part of the suite</p></div>
</div>
</div>
<div id="footnotes"><hr /></div>