diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-21 00:08:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-21 00:08:23 -0700 |
| commit | a28a920b817789e9535e30d163d1cfeda9803b99 (patch) | |
| tree | 0276dc9699fe17f0b3daa7ad772b8f34f11463b7 /git-merge-base.html | |
| parent | 010705ace148110d091fef2fb78d70223306d9e0 (diff) | |
| download | git-htmldocs-a28a920b817789e9535e30d163d1cfeda9803b99.tar.gz | |
Autogenerated HTML docs for v1.7.11-3-g60475
Diffstat (limited to 'git-merge-base.html')
| -rw-r--r-- | git-merge-base.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-merge-base.html b/git-merge-base.html index f48f4461c..23eaadfdb 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 when used with the <tt>--merge-base</tt> option.</p></div>
+from <a href="git-show-branch.html">git-show-branch(1)</a> when used with the <tt>--merge-base</tt> option.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
--octopus
@@ -704,12 +704,13 @@ 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>,
-,</p></div>
+<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>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Part of the suite</p></div>
+<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
</div>
<div id="footnotes"><hr /></div>
|