diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-17 14:46:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-17 14:46:49 -0800 |
| commit | 61525f915b47e953b4288a9afcee45e47b352214 (patch) | |
| tree | f0649f89cc7a77c0296305f4673fc2bc7e0a6d54 /git-difftool.html | |
| parent | bc8d4783cac3c942fc9e8cf2f3eae4aea8cab5cb (diff) | |
| download | git-htmldocs-61525f915b47e953b4288a9afcee45e47b352214.tar.gz | |
Autogenerated HTML docs for v1.9-rc0
Diffstat (limited to 'git-difftool.html')
| -rw-r--r-- | git-difftool.html | 76 |
1 files changed, 40 insertions, 36 deletions
diff --git a/git-difftool.html b/git-difftool.html index 75f4d8ab9..3d9fc54e0 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.8" />
+<meta name="generator" content="AsciiDoc 8.6.6" />
<title>git-difftool(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,15 +87,11 @@ ul, ol, li > p { ul > li { color: #aaa; }
ul > li > * { color: black; }
-.monospaced, code, pre {
- font-family: "Courier New", Courier, monospace;
- font-size: inherit;
- color: navy;
+pre {
padding: 0;
margin: 0;
}
-
#author {
color: #527bbd;
font-weight: bold;
@@ -353,7 +349,7 @@ div.colist td img { margin-bottom: 0.1em;
}
-div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
@@ -411,14 +407,18 @@ span.underline { text-decoration: underline; } span.overline { text-decoration: overline; }
span.line-through { text-decoration: line-through; }
-div.unbreakable { page-break-inside: avoid; }
-
/*
* xhtml11 specific
*
* */
+tt {
+ font-family: monospace;
+ font-size: inherit;
+ color: navy;
+}
+
div.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -452,6 +452,12 @@ div.tableblock > table[frame="vsides"] { *
* */
+.monospaced {
+ font-family: monospace;
+ font-size: inherit;
+ color: navy;
+}
+
table.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -531,8 +537,6 @@ body.manpage div.sectionbody { @media print {
body.manpage div#toc { display: none; }
}
-
-
</style>
<script type="text/javascript">
/*<+'])');
+ var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
// Function that scans the DOM tree for header elements (the DOM2
// nodeIterator API would be a better technique but not supported by all
// browsers).
@@ -606,7 +610,7 @@ toc: function (toclevels) { var i;
for (i = 0; i < toc.childNodes.length; i++) {
var entry = toc.childNodes[i];
- if (entry.nodeName.toLowerCase() == 'div'
+ if (entry.nodeName == 'div'
&& entry.getAttribute("class")
&& entry.getAttribute("class").match(/^toclevel/))
tocEntriesToRemove.push(entry);
@@ -652,7 +656,7 @@ footnotes: function () { var entriesToRemove = [];
for (i = 0; i < noteholder.childNodes.length; i++) {
var entry = noteholder.childNodes[i];
- if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
+ if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote")
entriesToRemove.push(entry);
}
for (i = 0; i < entriesToRemove.length; i++) {
@@ -807,38 +811,38 @@ to <em>git diff</em> and accepts the same options and arguments. See <dd>
<p>
Use the diff tool specified by <tool>. Valid values include
- emerge, kompare, meld, and vimdiff. Run <code>git difftool --tool-help</code>
+ emerge, kompare, meld, and vimdiff. Run <tt>git difftool --tool-help</tt>
for the list of valid <tool> settings.
</p>
<div class="paragraph"><p>If a diff tool is not specified, <em>git difftool</em>
-will use the configuration variable <code>diff.tool</code>. If the
-configuration variable <code>diff.tool</code> is not set, <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="paragraph"><p>You can explicitly provide a full path to the tool by setting the
-configuration variable <code>difftool.<tool>.path</code>. For example, you
+configuration variable <tt>difftool.<tool>.path</tt>. For example, you
can configure the absolute path to kdiff3 by setting
-<code>difftool.kdiff3.path</code>. Otherwise, <em>git difftool</em> assumes the
+<tt>difftool.kdiff3.path</tt>. Otherwise, <em>git difftool</em> assumes the
tool is available in PATH.</p></div>
<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 <code>difftool.<tool>.cmd</code>.</p></div>
+variable <tt>difftool.<tool>.cmd</tt>.</p></div>
<div class="paragraph"><p>When <em>git difftool</em> is invoked with this tool (either through the
-<code>-t</code> or <code>--tool</code> option or the <code>diff.tool</code> configuration variable)
+<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: <code>$LOCAL</code> is set to the name of the temporary
-file containing the contents of the diff pre-image and <code>$REMOTE</code>
+variables available: <tt>$LOCAL</tt> is set to the name of the temporary
+file containing the contents of the diff pre-image and <tt>$REMOTE</tt>
is set to the name of the temporary file containing the contents
-of the diff post-image. <code>$MERGED</code> is the name of the file which is
-being compared. <code>$BASE</code> is provided for compatibility
-with custom merge tool commands and has the same value as <code>$MERGED</code>.</p></div>
+of the diff post-image. <tt>$MERGED</tt> is the name of the file which is
+being compared. <tt>$BASE</tt> is provided for compatibility
+with custom merge tool commands and has the same value as <tt>$MERGED</tt>.</p></div>
</dd>
<dt class="hdlist1">
--tool-help
</dt>
<dd>
<p>
- Print a list of diff tools that may be used with <code>--tool</code>.
+ Print a list of diff tools that may be used with <tt>--tool</tt>.
</p>
</dd>
<dt class="hdlist1">
@@ -847,12 +851,12 @@ with custom merge tool commands and has the same value as <code>$MERGED</code>.< <dd>
<p>
<em>git difftool</em>'s default behavior is create symlinks to the
- working tree when run in <code>--dir-diff</code> mode and the right-hand
+ working tree when run in <tt>--dir-diff</tt> mode and the right-hand
side of the comparison yields the same content as the file in
the working tree.
</p>
-<div class="paragraph"><p>Specifying <code>--no-symlinks</code> instructs <em>git difftool</em> to create copies
-instead. <code>--no-symlinks</code> is the default on Windows.</p></div>
+<div class="paragraph"><p>Specifying <tt>--no-symlinks</tt> instructs <em>git difftool</em> to create copies
+instead. <tt>--no-symlinks</tt> is the default on Windows.</p></div>
</dd>
<dt class="hdlist1">
-x <command>
@@ -864,8 +868,8 @@ instead. <code>--no-symlinks</code> is the default on Windows.</p></div> <p>
Specify a custom command for viewing diffs.
<em>git-difftool</em> ignores the configured defaults and runs
- <code>$command $LOCAL $REMOTE</code> when this option is specified.
- Additionally, <code>$BASE</code> is set in the environment.
+ <tt>$command $LOCAL $REMOTE</tt> when this option is specified.
+ Additionally, <tt>$BASE</tt> is set in the environment.
</p>
</dd>
<dt class="hdlist1">
@@ -876,9 +880,9 @@ instead. <code>--no-symlinks</code> is the default on Windows.</p></div> </dt>
<dd>
<p>
- When <em>git-difftool</em> is invoked with the <code>-g</code> or <code>--gui</code> option
+ When <em>git-difftool</em> is invoked with the <tt>-g</tt> or <tt>--gui</tt> option
the default diff tool will be read from the configured
- <code>diff.guitool</code> variable instead of <code>diff.tool</code>.
+ <tt>diff.guitool</tt> variable instead of <tt>diff.tool</tt>.
</p>
</dd>
</dl></div>
@@ -904,7 +908,7 @@ diff.guitool </dt>
<dd>
<p>
- The default diff tool to use when <code>--gui</code> is specified.
+ The default diff tool to use when <tt>--gui</tt> is specified.
</p>
</dd>
<dt class="hdlist1">
@@ -923,7 +927,7 @@ difftool.<tool>.cmd <p>
Specify the command to invoke the specified diff tool.
</p>
-<div class="paragraph"><p>See the <code>--tool=<tool></code> option above for more details.</p></div>
+<div class="paragraph"><p>See the <tt>--tool=<tool></tt> option above for more details.</p></div>
</dd>
<dt class="hdlist1">
difftool.prompt
|