diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-01-31 05:03:45 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-01-31 05:03:45 +0000 |
| commit | 103b5722e7729973bb843e748abe7d4c8f8f9a28 (patch) | |
| tree | 41df9ce814249f764ea481aa0be0d4ae558a5a73 /git-merge-base.html | |
| parent | 80d5846a03ed076d5b5142f00d78047daef6ab45 (diff) | |
| download | git-htmldocs-103b5722e7729973bb843e748abe7d4c8f8f9a28.tar.gz | |
Autogenerated HTML docs for v1.7.4
Diffstat (limited to 'git-merge-base.html')
| -rw-r--r-- | git-merge-base.html | 200 |
1 files changed, 148 insertions, 52 deletions
diff --git a/git-merge-base.html b/git-merge-base.html index 6968da1b4..58dccfe70 100644 --- a/git-merge-base.html +++ b/git-merge-base.html @@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.2.5" />
+<meta name="generator" content="AsciiDoc 8.4.5" />
+<title>git-merge-base(1)</title>
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -26,10 +27,12 @@ a:visited { em {
font-style: italic;
+ color: navy;
}
strong {
font-weight: bold;
+ color: #083194;
}
tt {
@@ -71,6 +74,10 @@ p { margin-bottom: 0.5em;
}
+ul, ol, li > p {
+ margin-top: 0;
+}
+
pre {
padding: 0;
margin: 0;
@@ -84,7 +91,7 @@ span#author { }
span#email {
}
-span#revision {
+span#revnumber, span#revdate, span#revremark {
font-family: sans-serif;
}
@@ -104,11 +111,13 @@ div#footer-badges { padding-bottom: 0.5em;
}
-div#preamble,
+div#preamble {
+ margin-top: 1.5em;
+ margin-bottom: 1.5em;
+}
div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
- margin-right: 10%;
margin-top: 1.5em;
margin-bottom: 1.5em;
}
@@ -123,6 +132,7 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
text-align: left;
@@ -149,22 +159,33 @@ div.sidebarblock > div.content { padding: 0.5em;
}
-div.listingblock {
- margin-right: 0%;
-}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
-div.quoteblock > div.content {
+div.quoteblock {
padding-left: 2.0em;
+ margin-right: 10%;
}
-
-div.attribution {
+div.quoteblock > div.attribution {
+ padding-top: 0.5em;
text-align: right;
}
+
+div.verseblock {
+ padding-left: 2.0em;
+ margin-right: 10%;
+}
+div.verseblock > div.content {
+ white-space: pre;
+}
+div.verseblock > div.attribution {
+ padding-top: 0.75em;
+ text-align: left;
+}
+/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
text-align: left;
}
@@ -187,13 +208,9 @@ div.exampleblock > div.content { padding: 0.5em;
}
-div.verseblock div.content {
- white-space: pre;
-}
-
div.imageblock div.content { padding-left: 0; }
-div.imageblock img { border: 1px solid silver; }
span.image img { border-style: none; }
+a.image:visited { color: white; }
dl {
margin-top: 0.8em;
@@ -202,18 +219,38 @@ dl { dt {
margin-top: 0.5em;
margin-bottom: 0;
- font-style: italic;
+ font-style: normal;
+ color: navy;
}
dd > *:first-child {
- margin-top: 0;
+ margin-top: 0.1em;
}
ul, ol {
list-style-position: outside;
}
-div.olist2 ol {
+ol.arabic {
+ list-style-type: decimal;
+}
+ol.loweralpha {
list-style-type: lower-alpha;
}
+ol.upperalpha {
+ list-style-type: upper-alpha;
+}
+ol.lowerroman {
+ list-style-type: lower-roman;
+}
+ol.upperroman {
+ list-style-type: upper-roman;
+}
+
+div.compact ul, div.compact ol,
+div.compact p, div.compact p,
+div.compact div, div.compact div {
+ margin-top: 0.1em;
+ margin-bottom: 0.1em;
+}
div.tableblock > table {
border: 3px solid #527bbd;
@@ -225,22 +262,53 @@ thead { tfoot {
font-weight: bold;
}
+td > div.verse {
+ white-space: pre;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
+ border-style: none;
+}
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
+}
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
+}
+
-div.hlist {
+div.hdlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
-div.hlist td {
- padding-bottom: 5px;
+div.hdlist tr {
+ padding-bottom: 15px;
}
-td.hlist1 {
+dt.hdlist1.strong, td.hdlist1.strong {
+ font-weight: bold;
+}
+td.hdlist1 {
vertical-align: top;
- font-style: italic;
+ font-style: normal;
padding-right: 0.8em;
+ color: navy;
}
-td.hlist2 {
+td.hdlist2 {
vertical-align: top;
}
+div.hdlist.compact tr {
+ margin: 0;
+ padding-bottom: 0;
+}
+
+.comment {
+ background: yellow;
+}
@media print {
div#footer-badges { display: none; }
@@ -271,7 +339,24 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-include1::./stylesheets/xhtml11-manpage.css[]
+/* Overrides for manpage documents */
+h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+h2 {
+ border-style: none;
+}
+div.sectionbody {
+ margin-left: 5%;
+}
+
+@media print {
+ div#toc { display: none; }
+}
+
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -280,6 +365,7 @@ div.sidebar-content { padding: 0.5em;
}
div.sidebar-title, div.image-title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
margin-top: 0.0em;
@@ -292,8 +378,17 @@ div.listingblock div.content { padding: 0.5em;
}
-div.quoteblock-content {
- padding-left: 2.0em;
+div.quoteblock-attribution {
+ padding-top: 0.5em;
+ text-align: right;
+}
+
+div.verseblock-content {
+ white-space: pre;
+}
+div.verseblock-attribution {
+ padding-top: 0.75em;
+ text-align: left;
}
div.exampleblock-content {
@@ -304,7 +399,6 @@ div.exampleblock-content { /* IE6 sets dynamically generated links as visited. */
div#toc a:visited { color: blue; }
</style>
-<title>git-merge-base(1)</title>
</head>
<body>
<div id="header">
@@ -318,37 +412,39 @@ git-merge-base(1) Manual Page </p>
</div>
</div>
-<h2>SYNOPSIS</h2>
+<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git merge-base</em> [-a|--all] [--octopus] <commit> <commit>…
-<em>git merge-base</em> --independent <commit>…</div></div>
+<div class="verseblock-content"><em>git merge-base</em> [-a|--all] [--octopus] <commit> <commit>…
+<em>git merge-base</em> --independent <commit>…</div>
+<div class="verseblock-attribution">
+</div></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="paragraph"><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
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>Unless <tt>--octopus</tt> is given, among the two commits to compute the merge
+<div class="paragraph"><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
+<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>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
-a
</dt>
-<dt>
+<dt class="hdlist1">
--all
</dt>
<dd>
@@ -356,7 +452,7 @@ 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>
+<dt class="hdlist1">
--octopus
</dt>
<dd>
@@ -366,7 +462,7 @@ from <a href="git-show-branch.html">git-show-branch(1)</a> when used with the <t of <em>git show-branch --merge-base</em>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--independent
</dt>
<dd>
@@ -382,17 +478,17 @@ from <a href="git-show-branch.html">git-show-branch(1)</a> when used with the <t </div>
<h2 id="_discussion">DISCUSSION</h2>
<div class="sectionbody">
-<div class="para"><p>Given two commits <em>A</em> and <em>B</em>, <tt>git merge-base A B</tt> will output a commit
+<div class="paragraph"><p>Given two commits <em>A</em> and <em>B</em>, <tt>git merge-base A B</tt> will output a commit
which is reachable from both <em>A</em> and <em>B</em> through the parent relationship.</p></div>
-<div class="para"><p>For example, with this topology:</p></div>
+<div class="paragraph"><p>For example, with this topology:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt> o---o---o---B
/
---o---1---o---o---o---A</tt></pre>
</div></div>
-<div class="para"><p>the merge base between <em>A</em> and <em>B</em> is <em>1</em>.</p></div>
-<div class="para"><p>Given three commits <em>A</em>, <em>B</em> and <em>C</em>, <tt>git merge-base A B C</tt> will compute the
+<div class="paragraph"><p>the merge base between <em>A</em> and <em>B</em> is <em>1</em>.</p></div>
+<div class="paragraph"><p>Given three commits <em>A</em>, <em>B</em> and <em>C</em>, <tt>git merge-base A B C</tt> will compute the
merge base between <em>A</em> and a hypothetical commit <em>M</em>, which is a merge
between <em>B</em> and <em>C</em>. For example, with this topology:</p></div>
<div class="literalblock">
@@ -403,7 +499,7 @@ between <em>B</em> and <em>C</em>. For example, with this topology:</p></div> / /
---2---1---o---o---o---A</tt></pre>
</div></div>
-<div class="para"><p>the result of <tt>git merge-base A B C</tt> is <em>1</em>. This is because the
+<div class="paragraph"><p>the result of <tt>git merge-base A B C</tt> is <em>1</em>. This is because the
equivalent topology with a merge commit <em>M</em> between <em>B</em> and <em>C</em> is:</p></div>
<div class="literalblock">
<div class="content">
@@ -413,10 +509,10 @@ equivalent topology with a merge commit <em>M</em> between <em>B</em> and <em>C< / /
---2---1---o---o---o---A</tt></pre>
</div></div>
-<div class="para"><p>and the result of <tt>git merge-base A M</tt> is <em>1</em>. Commit <em>2</em> is also a
+<div class="paragraph"><p>and the result of <tt>git merge-base A M</tt> is <em>1</em>. Commit <em>2</em> is also a
common ancestor between <em>A</em> and <em>M</em>, but <em>1</em> is a better common ancestor,
because <em>2</em> is an ancestor of <em>1</em>. Hence, <em>2</em> is not a merge base.</p></div>
-<div class="para"><p>When the history involves criss-cross merges, there can be more than one
+<div class="paragraph"><p>When the history involves criss-cross merges, there can be more than one
<em>best</em> common ancestor for two commits. For example, with this topology:</p></div>
<div class="literalblock">
<div class="content">
@@ -426,31 +522,31 @@ because <em>2</em> is an ancestor of <em>1</em>. Hence, <em>2</em> is not a mer / \
---2---o---o---B</tt></pre>
</div></div>
-<div class="para"><p>both <em>1</em> and <em>2</em> are merge-bases of A and B. Neither one is better than
+<div class="paragraph"><p>both <em>1</em> and <em>2</em> are merge-bases of A and B. Neither one is better than
the other (both are <em>best</em> merge bases). When the <tt>--all</tt> option is not given,
it is unspecified which best one is output.</p></div>
</div>
<h2 id="_author">Author</h2>
<div class="sectionbody">
-<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>
+<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></p></div>
</div>
<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>
+<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</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>,
+<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="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
+<div class="paragraph"><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-09-18 23:56:48 UTC
+Last updated 2010-09-03 21:29:54 UTC
</div>
</div>
</body>
|