Autogenerated HTML docs for v1.7.3.3-398-g0b0cd

author: Junio C Hamano <junio@kernel.org> 2010-12-05 06:20:48 +0000
committer: Junio C Hamano <junio@kernel.org> 2010-12-05 06:20:48 +0000
commit: 2e6ded8990e867c457680899597363f3c1dd07f6 (patch)
tree: a8b3625c96ffe486511441a9944dfcfe3231bf40 /git-difftool.html
parent: d3dc64968e5141a389eeb491876e2aab1da90c24 (diff)
download: git-htmldocs-2e6ded8990e867c457680899597363f3c1dd07f6.tar.gz
1 files changed, 158 insertions, 63 deletions
diff --git a/git-difftool.html b/git-difftool.html
index 6f60ca366..7e44f1d06 100644
--- a/git-difftool.html
+++ b/git-difftool.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-difftool(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-difftool(1)</title>
 </head>
 <body>
 <div id="header">
@@ -318,23 +412,24 @@ git-difftool(1) Manual Page
 </p>
 </div>
 </div>
-<h2>SYNOPSIS</h2>
+<h2 id="_synopsis">SYNOPSIS</h2>
 <div class="sectionbody">
-<div class="para"><p><em>git difftool</em> [&lt;options&gt;] &lt;commit&gt;{0,2} [--] [&lt;path&gt;&#8230;]</p></div>
+<div class="paragraph"><p><em>git difftool</em> [&lt;options&gt;] [&lt;commit&gt; [&lt;commit&gt;]] [--] [&lt;path&gt;&#8230;]</p></div>
 </div>
 <h2 id="_description">DESCRIPTION</h2>
 <div class="sectionbody">
-<div class="para"><p><em>git difftool</em> is a git command that allows you to compare and edit files
+<div class="paragraph"><p><em>git difftool</em> is a git command that allows you to compare and edit files
 between revisions using common diff tools.  <em>git difftool</em> is a frontend
-to <em>git diff</em> and accepts the same options and arguments.</p></div>
+to <em>git diff</em> and accepts the same options and arguments. See
+<a href="git-diff.html">git-diff(1)</a>.</p></div>
 </div>
 <h2 id="_options">OPTIONS</h2>
 <div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
 -y
 </dt>
-<dt>
+<dt class="hdlist1">
 --no-prompt
 </dt>
 <dd>
@@ -342,7 +437,7 @@ to <em>git diff</em> and accepts the same options and arguments.</p></div>
         Do not prompt before launching a diff tool.
 </p>
 </dd>
-<dt>
+<dt class="hdlist1">
 --prompt
 </dt>
 <dd>
@@ -352,10 +447,10 @@ to <em>git diff</em> and accepts the same options and arguments.</p></div>
         override any configuration settings.
 </p>
 </dd>
-<dt>
+<dt class="hdlist1">
 -t &lt;tool&gt;
 </dt>
-<dt>
+<dt class="hdlist1">
 --tool=&lt;tool&gt;
 </dt>
 <dd>
@@ -365,20 +460,20 @@ to <em>git diff</em> and accepts the same options and arguments.</p></div>
         kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
         ecmerge, diffuse, opendiff, p4merge and araxis.
 </p>
-<div class="para"><p>If a diff tool is not specified, <em>git difftool</em>
+<div class="paragraph"><p>If a diff tool is not specified, <em>git difftool</em>
 will use the configuration variable <tt>diff.tool</tt>.  If the
 configuration variable <tt>diff.tool</tt> is not set, <em>git difftool</em>
 will pick a suitable default.</p></div>
-<div class="para"><p>You can explicitly provide a full path to the tool by setting the
+<div class="paragraph"><p>You can explicitly provide a full path to the tool by setting the
 configuration variable <tt>difftool.&lt;tool&gt;.path</tt>. For example, you
 can configure the absolute path to kdiff3 by setting
 <tt>difftool.kdiff3.path</tt>. Otherwise, <em>git difftool</em> assumes the
 tool is available in PATH.</p></div>
-<div class="para"><p>Instead of running one of the known diff tools,
+<div class="paragraph"><p>Instead of running one of the known diff tools,
 <em>git difftool</em> can be customized to run an alternative program
 by specifying the command line to invoke in a configuration
 variable <tt>difftool.&lt;tool&gt;.cmd</tt>.</p></div>
-<div class="para"><p>When <em>git difftool</em> is invoked with this tool (either through the
+<div class="paragraph"><p>When <em>git difftool</em> is invoked with this tool (either through the
 <tt>-t</tt> or <tt>--tool</tt> option or the <tt>diff.tool</tt> configuration variable)
 the configured command line will be invoked with the following
 variables available: <tt>$LOCAL</tt> is set to the name of the temporary
@@ -387,10 +482,10 @@ is set to the name of the temporary file containing the contents
 of the diff post-image.  <tt>$BASE</tt> is provided for compatibility
 with custom merge tool commands and has the same value as <tt>$LOCAL</tt>.</p></div>
 </dd>
-<dt>
+<dt class="hdlist1">
 -x &lt;command&gt;
 </dt>
-<dt>
+<dt class="hdlist1">
 --extcmd=&lt;command&gt;
 </dt>
 <dd>
@@ -400,10 +495,10 @@ with custom merge tool commands and has the same value as <tt>$LOCAL</tt>.</p></
         <tt>$command $LOCAL $REMOTE</tt> when this option is specified.
 </p>
 </dd>
-<dt>
+<dt class="hdlist1">
 -g
 </dt>
-<dt>
+<dt class="hdlist1">
 --gui
 </dt>
 <dd>
@@ -414,14 +509,14 @@ with custom merge tool commands and has the same value as <tt>$LOCAL</tt>.</p></
 </p>
 </dd>
 </dl></div>
-<div class="para"><p>See <a href="git-diff.html">git-diff(1)</a> for the full list of supported options.</p></div>
+<div class="paragraph"><p>See <a href="git-diff.html">git-diff(1)</a> for the full list of supported options.</p></div>
 </div>
 <h2 id="_config_variables">CONFIG VARIABLES</h2>
 <div class="sectionbody">
-<div class="para"><p><em>git difftool</em> falls back to <em>git mergetool</em> config variables when the
+<div class="paragraph"><p><em>git difftool</em> falls back to <em>git mergetool</em> config variables when the
 difftool equivalents have not been defined.</p></div>
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
 diff.tool
 </dt>
 <dd>
@@ -429,7 +524,7 @@ diff.tool
         The default diff tool to use.
 </p>
 </dd>
-<dt>
+<dt class="hdlist1">
 diff.guitool
 </dt>
 <dd>
@@ -437,7 +532,7 @@ diff.guitool
         The default diff tool to use when <tt>--gui</tt> is specified.
 </p>
 </dd>
-<dt>
+<dt class="hdlist1">
 difftool.&lt;tool&gt;.path
 </dt>
 <dd>
@@ -446,16 +541,16 @@ difftool.&lt;tool&gt;.path
         your tool is not in the PATH.
 </p>
 </dd>
-<dt>
+<dt class="hdlist1">
 difftool.&lt;tool&gt;.cmd
 </dt>
 <dd>
 <p>
         Specify the command to invoke the specified diff tool.
 </p>
-<div class="para"><p>See the <tt>--tool=&lt;tool&gt;</tt> option above for more details.</p></div>
+<div class="paragraph"><p>See the <tt>--tool=&lt;tool&gt;</tt> option above for more details.</p></div>
 </dd>
-<dt>
+<dt class="hdlist1">
 difftool.prompt
 </dt>
 <dd>
@@ -467,8 +562,8 @@ difftool.prompt
 </div>
 <h2 id="_see_also">SEE ALSO</h2>
 <div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
 <a href="git-diff.html">git-diff(1)</a>
 </dt>
 <dd>
@@ -476,7 +571,7 @@ difftool.prompt
          Show changes between commits, commit and working tree, etc
 </p>
 </dd>
-<dt>
+<dt class="hdlist1">
 <a href="git-mergetool.html">git-mergetool(1)</a>
 </dt>
 <dd>
@@ -484,7 +579,7 @@ difftool.prompt
         Run merge conflict resolution tools to resolve merge conflicts
 </p>
 </dd>
-<dt>
+<dt class="hdlist1">
 <a href="git-config.html">git-config(1)</a>
 </dt>
 <dd>
@@ -496,19 +591,19 @@ difftool.prompt
 </div>
 <h2 id="_author">AUTHOR</h2>
 <div class="sectionbody">
-<div class="para"><p>Written by David Aguilar &lt;davvid@gmail.com&gt;.</p></div>
+<div class="paragraph"><p>Written by David Aguilar &lt;<a href="mailto:davvid@gmail.com">davvid@gmail.com</a>&gt;.</p></div>
 </div>
 <h2 id="_documentation">Documentation</h2>
 <div class="sectionbody">
-<div class="para"><p>Documentation by David Aguilar and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
+<div class="paragraph"><p>Documentation by David Aguilar and the git-list &lt;<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>&gt;.</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:41 UTC
+Last updated 2010-12-05 06:20:21 UTC
 </div>
 </div>
 </body>
author	Junio C Hamano <junio@kernel.org>	2010-12-05 06:20:48 +0000
committer	Junio C Hamano <junio@kernel.org>	2010-12-05 06:20:48 +0000
commit	2e6ded8990e867c457680899597363f3c1dd07f6 (patch)
tree	a8b3625c96ffe486511441a9944dfcfe3231bf40 /git-difftool.html
parent	d3dc64968e5141a389eeb491876e2aab1da90c24 (diff)
download	git-htmldocs-2e6ded8990e867c457680899597363f3c1dd07f6.tar.gz