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-index.html | |
| parent | 80d5846a03ed076d5b5142f00d78047daef6ab45 (diff) | |
| download | git-htmldocs-103b5722e7729973bb843e748abe7d4c8f8f9a28.tar.gz | |
Autogenerated HTML docs for v1.7.4
Diffstat (limited to 'git-merge-index.html')
| -rw-r--r-- | git-merge-index.html | 196 |
1 files changed, 145 insertions, 51 deletions
diff --git a/git-merge-index.html b/git-merge-index.html index 7d65a0146..1bf1f7a5e 100644 --- a/git-merge-index.html +++ b/git-merge-index.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-index(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;
+}
+dt.hdlist1.strong, td.hdlist1.strong {
+ font-weight: bold;
}
-td.hlist1 {
+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-index(1)</title>
</head>
<body>
<div id="header">
@@ -318,21 +412,21 @@ git-merge-index(1) Manual Page </p>
</div>
</div>
-<h2>SYNOPSIS</h2>
+<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
-<div class="para"><p><em>git merge-index</em> [-o] [-q] <merge-program> (-a | [--] <file>*)</p></div>
+<div class="paragraph"><p><em>git merge-index</em> [-o] [-q] <merge-program> (-a | [--] <file>*)</p></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>This looks up the <file>(s) in the index and, if there are any merge
+<div class="paragraph"><p>This looks up the <file>(s) in the index and, if there are any merge
entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty
argument if no file), and <file> as argument 4. File modes for the three
files are passed as arguments 5, 6 and 7.</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
--
</dt>
<dd>
@@ -340,7 +434,7 @@ files are passed as arguments 5, 6 and 7.</p></div> Do not interpret any more arguments as options.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-a
</dt>
<dd>
@@ -348,7 +442,7 @@ files are passed as arguments 5, 6 and 7.</p></div> Run merge against all files in the index that need merging.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-o
</dt>
<dd>
@@ -359,7 +453,7 @@ files are passed as arguments 5, 6 and 7.</p></div> merges.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-q
</dt>
<dd>
@@ -370,18 +464,18 @@ files are passed as arguments 5, 6 and 7.</p></div> </p>
</dd>
</dl></div>
-<div class="para"><p>If <em>git merge-index</em> is called with multiple <file>s (or -a) then it
+<div class="paragraph"><p>If <em>git merge-index</em> is called with multiple <file>s (or -a) then it
processes them in turn only stopping if merge returns a non-zero exit
code.</p></div>
-<div class="para"><p>Typically this is run with a script calling git's imitation of
+<div class="paragraph"><p>Typically this is run with a script calling git’s imitation of
the <em>merge</em> command from the RCS package.</p></div>
-<div class="para"><p>A sample script called <em>git merge-one-file</em> is included in the
+<div class="paragraph"><p>A sample script called <em>git merge-one-file</em> is included in the
distribution.</p></div>
-<div class="para"><p>ALERT ALERT ALERT! The git "merge object order" is different from the
+<div class="paragraph"><p>ALERT ALERT ALERT! The git "merge object order" is different from the
RCS <em>merge</em> program merge object order. In the above ordering, the
original is first. But the argument order to the 3-way merge program
-<em>merge</em> is to have the original in the middle. Don't ask me why.</p></div>
-<div class="para"><p>Examples:</p></div>
+<em>merge</em> is to have the original in the middle. Don’t ask me why.</p></div>
+<div class="paragraph"><p>Examples:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>torvalds@ppc970:~/merge-test> git merge-index cat MM
@@ -390,7 +484,7 @@ This is modified MM in the branch A. # merge1 This is modified MM in the branch B. # merge2
This is modified MM in the branch B. # current contents</tt></pre>
</div></div>
-<div class="para"><p>or</p></div>
+<div class="paragraph"><p>or</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>torvalds@ppc970:~/merge-test> git merge-index cat AA MM
@@ -400,27 +494,27 @@ This is added AA in the branch B. This is added AA in the branch B.
fatal: merge program failed</tt></pre>
</div></div>
-<div class="para"><p>where the latter example shows how <em>git merge-index</em> will stop trying to
+<div class="paragraph"><p>where the latter example shows how <em>git merge-index</em> will stop trying to
merge once anything has returned an error (i.e., <tt>cat</tt> returned an error
-for the AA file, because it didn't exist in the original, and thus
-<em>git merge-index</em> didn't even try to merge the MM thing).</p></div>
+for the AA file, because it didn’t exist in the original, and thus
+<em>git merge-index</em> didn’t even try to merge the MM thing).</p></div>
</div>
<h2 id="_author">Author</h2>
<div class="sectionbody">
-<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>
-One-shot merge by Petr Baudis <pasky@ucw.cz></p></div>
+<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>>
+One-shot merge by Petr Baudis <<a href="mailto:pasky@ucw.cz">pasky@ucw.cz</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="_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:49 UTC
+Last updated 2010-09-03 21:29:54 UTC
</div>
</div>
</body>
|