Google Git
Sign in
chromium / external / gitster / git-htmldocs / 693e70961ac5a79a46303795f3ca6a0bfd62f375 / . / git-difftool.html
blob: 76ab5e501da30b40ed5fd66a70ff671ac3caa2ea [file] [log] [blame]
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]6<meta name="generator" content="AsciiDoc 8.5.2" />
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]7<title>git-difftool(1)</title>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]8<style type="text/css">
9/* Debug borders */
10p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
11/*
12 border: 1px solid red;
13*/
14}
15
16body {
17 margin: 1em 5% 1em 5%;
18}
19
20a {
21 color: blue;
22 text-decoration: underline;
23}
24a:visited {
25 color: fuchsia;
26}
27
28em {
29 font-style: italic;
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]30 color: navy;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]31}
32
33strong {
34 font-weight: bold;
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]35 color: #083194;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]36}
37
38tt {
39 color: navy;
40}
41
42h1, h2, h3, h4, h5, h6 {
43 color: #527bbd;
44 font-family: sans-serif;
45 margin-top: 1.2em;
46 margin-bottom: 0.5em;
47 line-height: 1.3;
48}
49
50h1, h2, h3 {
51 border-bottom: 2px solid silver;
52}
53h2 {
54 padding-top: 0.5em;
55}
56h3 {
57 float: left;
58}
59h3 + * {
60 clear: left;
61}
62
63div.sectionbody {
64 font-family: serif;
65 margin-left: 0;
66}
67
68hr {
69 border: 1px solid silver;
70}
71
72p {
73 margin-top: 0.5em;
74 margin-bottom: 0.5em;
75}
76
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]77ul, ol, li > p {
78 margin-top: 0;
79}
80
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]81pre {
82 padding: 0;
83 margin: 0;
84}
85
86span#author {
87 color: #527bbd;
88 font-family: sans-serif;
89 font-weight: bold;
90 font-size: 1.1em;
91}
92span#email {
93}
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]94span#revnumber, span#revdate, span#revremark {
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]95 font-family: sans-serif;
96}
97
98div#footer {
99 font-family: sans-serif;
100 font-size: small;
101 border-top: 2px solid silver;
102 padding-top: 0.5em;
103 margin-top: 4.0em;
104}
105div#footer-text {
106 float: left;
107 padding-bottom: 0.5em;
108}
109div#footer-badges {
110 float: right;
111 padding-bottom: 0.5em;
112}
113
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]114div#preamble {
115 margin-top: 1.5em;
116 margin-bottom: 1.5em;
117}
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]118div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
119div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
120div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]121 margin-top: 1.0em;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]122 margin-bottom: 1.5em;
123}
124div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]125 margin-top: 2.0em;
126 margin-bottom: 2.0em;
127 margin-right: 10%;
128 color: #606060;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]129}
130
131div.content { /* Block element content. */
132 padding: 0;
133}
134
135/* Block element titles. */
136div.title, caption.title {
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]137 color: #527bbd;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]138 font-family: sans-serif;
139 font-weight: bold;
140 text-align: left;
141 margin-top: 1.0em;
142 margin-bottom: 0.5em;
143}
144div.title + * {
145 margin-top: 0;
146}
147
148td div.title:first-child {
149 margin-top: 0.0em;
150}
151div.content div.title:first-child {
152 margin-top: 0.0em;
153}
154div.content + div.title {
155 margin-top: 0.0em;
156}
157
158div.sidebarblock > div.content {
159 background: #ffffee;
160 border: 1px solid silver;
161 padding: 0.5em;
162}
163
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]164div.listingblock > div.content {
165 border: 1px solid silver;
166 background: #f4f4f4;
167 padding: 0.5em;
168}
169
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]170div.quoteblock, div.verseblock {
171 padding-left: 1.0em;
172 margin-left: 1.0em;
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]173 margin-right: 10%;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]174 border-left: 5px solid #dddddd;
175 color: #777777;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]176}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]177
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]178div.quoteblock > div.attribution {
179 padding-top: 0.5em;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]180 text-align: right;
181}
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]182
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]183div.verseblock > div.content {
184 white-space: pre;
185}
186div.verseblock > div.attribution {
187 padding-top: 0.75em;
188 text-align: left;
189}
190/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]191div.verseblock + div.attribution {
192 text-align: left;
193}
194
195div.admonitionblock .icon {
196 vertical-align: top;
197 font-size: 1.1em;
198 font-weight: bold;
199 text-decoration: underline;
200 color: #527bbd;
201 padding-right: 0.5em;
202}
203div.admonitionblock td.content {
204 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]205 border-left: 3px solid #dddddd;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]206}
207
208div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]209 border-left: 3px solid #dddddd;
210 padding-left: 0.5em;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]211}
212
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]213div.imageblock div.content { padding-left: 0; }
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]214span.image img { border-style: none; }
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]215a.image:visited { color: white; }
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]216
217dl {
218 margin-top: 0.8em;
219 margin-bottom: 0.8em;
220}
221dt {
222 margin-top: 0.5em;
223 margin-bottom: 0;
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]224 font-style: normal;
225 color: navy;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]226}
227dd > *:first-child {
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]228 margin-top: 0.1em;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]229}
230
231ul, ol {
232 list-style-position: outside;
233}
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]234ol.arabic {
235 list-style-type: decimal;
236}
237ol.loweralpha {
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]238 list-style-type: lower-alpha;
239}
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]240ol.upperalpha {
241 list-style-type: upper-alpha;
242}
243ol.lowerroman {
244 list-style-type: lower-roman;
245}
246ol.upperroman {
247 list-style-type: upper-roman;
248}
249
250div.compact ul, div.compact ol,
251div.compact p, div.compact p,
252div.compact div, div.compact div {
253 margin-top: 0.1em;
254 margin-bottom: 0.1em;
255}
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]256
257div.tableblock > table {
258 border: 3px solid #527bbd;
259}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]260thead, p.table.header {
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]261 font-family: sans-serif;
262 font-weight: bold;
263}
264tfoot {
265 font-weight: bold;
266}
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]267td > div.verse {
268 white-space: pre;
269}
270p.table {
271 margin-top: 0;
272}
273/* Because the table frame attribute is overriden by CSS in most browsers. */
274div.tableblock > table[frame="void"] {
275 border-style: none;
276}
277div.tableblock > table[frame="hsides"] {
278 border-left-style: none;
279 border-right-style: none;
280}
281div.tableblock > table[frame="vsides"] {
282 border-top-style: none;
283 border-bottom-style: none;
284}
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]285
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]286
287div.hdlist {
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]288 margin-top: 0.8em;
289 margin-bottom: 0.8em;
290}
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]291div.hdlist tr {
292 padding-bottom: 15px;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]293}
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]294dt.hdlist1.strong, td.hdlist1.strong {
295 font-weight: bold;
296}
297td.hdlist1 {
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]298 vertical-align: top;
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]299 font-style: normal;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]300 padding-right: 0.8em;
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]301 color: navy;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]302}
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]303td.hdlist2 {
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]304 vertical-align: top;
305}
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]306div.hdlist.compact tr {
307 margin: 0;
308 padding-bottom: 0;
309}
310
311.comment {
312 background: yellow;
313}
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]314
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]315.footnote, .footnoteref {
316 font-size: 0.8em;
317}
318
319span.footnote, span.footnoteref {
320 vertical-align: super;
321}
322
323#footnotes {
324 margin: 20px 0 20px 0;
325 padding: 7px 0 0 0;
326}
327
328#footnotes div.footnote {
329 margin: 0 0 5px 0;
330}
331
332#footnotes hr {
333 border: none;
334 border-top: 1px solid silver;
335 height: 1px;
336 text-align: left;
337 margin-left: 0;
338 width: 20%;
339 min-width: 100px;
340}
341
342
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]343@media print {
344 div#footer-badges { display: none; }
345}
346
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]347div#toc {
348 margin-bottom: 2.5em;
349}
350
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]351div#toctitle {
352 color: #527bbd;
353 font-family: sans-serif;
354 font-size: 1.1em;
355 font-weight: bold;
356 margin-top: 1.0em;
357 margin-bottom: 0.1em;
358}
359
360div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
361 margin-top: 0;
362 margin-bottom: 0;
363}
364div.toclevel2 {
365 margin-left: 2em;
366 font-size: 0.9em;
367}
368div.toclevel3 {
369 margin-left: 4em;
370 font-size: 0.9em;
371}
372div.toclevel4 {
373 margin-left: 6em;
374 font-size: 0.9em;
375}
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]376/* Overrides for manpage documents */
377h1 {
378 padding-top: 0.5em;
379 padding-bottom: 0.5em;
380 border-top: 2px solid silver;
381 border-bottom: 2px solid silver;
382}
383h2 {
384 border-style: none;
385}
386div.sectionbody {
387 margin-left: 5%;
388}
389
390@media print {
391 div#toc { display: none; }
392}
393
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]394/* Workarounds for IE6's broken and incomplete CSS2. */
395
396div.sidebar-content {
397 background: #ffffee;
398 border: 1px solid silver;
399 padding: 0.5em;
400}
401div.sidebar-title, div.image-title {
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]402 color: #527bbd;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]403 font-family: sans-serif;
404 font-weight: bold;
405 margin-top: 0.0em;
406 margin-bottom: 0.5em;
407}
408
409div.listingblock div.content {
410 border: 1px solid silver;
411 background: #f4f4f4;
412 padding: 0.5em;
413}
414
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]415div.quoteblock-attribution {
416 padding-top: 0.5em;
417 text-align: right;
418}
419
420div.verseblock-content {
421 white-space: pre;
422}
423div.verseblock-attribution {
424 padding-top: 0.75em;
425 text-align: left;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]426}
427
428div.exampleblock-content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]429 border-left: 3px solid #dddddd;
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]430 padding-left: 0.5em;
431}
432
433/* IE6 sets dynamically generated links as visited. */
434div#toc a:visited { color: blue; }
435</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]436<script type="text/javascript">
437/*<![CDATA[*/
438window.onload = function(){asciidoc.footnotes();}
439var asciidoc = { // Namespace.
440
441/////////////////////////////////////////////////////////////////////
442// Table Of Contents generator
443/////////////////////////////////////////////////////////////////////
444
445/* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
454
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
457
458// toclevels = 1..4.
459toc: function (toclevels) {
460
461 function getText(el) {
462 var text = "";
463 for (var i = el.firstChild; i != null; i = i.nextSibling) {
464 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
465 text += i.data;
466 else if (i.firstChild != null)
467 text += getText(i);
468 }
469 return text;
470 }
471
472 function TocEntry(el, text, toclevel) {
473 this.element = el;
474 this.text = text;
475 this.toclevel = toclevel;
476 }
477
478 function tocEntries(el, toclevels) {
479 var result = new Array;
480 var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
484 var iterate = function (el) {
485 for (var i = el.firstChild; i != null; i = i.nextSibling) {
486 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
487 var mo = re.exec(i.tagName);
488 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
489 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
490 }
491 iterate(i);
492 }
493 }
494 }
495 iterate(el);
496 return result;
497 }
498
499 var toc = document.getElementById("toc");
500 var entries = tocEntries(document.getElementById("content"), toclevels);
501 for (var i = 0; i < entries.length; ++i) {
502 var entry = entries[i];
503 if (entry.element.id == "")
504 entry.element.id = "_toc_" + i;
505 var a = document.createElement("a");
506 a.href = "#" + entry.element.id;
507 a.appendChild(document.createTextNode(entry.text));
508 var div = document.createElement("div");
509 div.appendChild(a);
510 div.className = "toclevel" + entry.toclevel;
511 toc.appendChild(div);
512 }
513 if (entries.length == 0)
514 toc.parentNode.removeChild(toc);
515},
516
517
518/////////////////////////////////////////////////////////////////////
519// Footnotes generator
520/////////////////////////////////////////////////////////////////////
521
522/* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
525
526footnotes: function () {
527 var cont = document.getElementById("content");
528 var noteholder = document.getElementById("footnotes");
529 var spans = cont.getElementsByTagName("span");
530 var refs = {};
531 var n = 0;
532 for (i=0; i<spans.length; i++) {
533 if (spans[i].className == "footnote") {
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
537 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
538 noteholder.innerHTML +=
539 "<div class='footnote' id='_footnote_" + n + "'>" +
540 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
541 n + "</a>. " + note + "</div>";
542 spans[i].innerHTML =
543 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
544 "' title='View footnote' class='footnote'>" + n + "</a>]";
545 var id =spans[i].getAttribute("id");
546 if (id != null) refs["#"+id] = n;
547 }
548 }
549 if (n == 0)
550 noteholder.parentNode.removeChild(noteholder);
551 else {
552 // Process footnoterefs.
553 for (i=0; i<spans.length; i++) {
554 if (spans[i].className == "footnoteref") {
555 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
556 href = href.match(/#.*/)[0]; // Because IE return full URL.
557 n = refs[href];
558 spans[i].innerHTML =
559 "[<a href='#_footnote_" + n +
560 "' title='View footnote' class='footnote'>" + n + "</a>]";
561 }
562 }
563 }
564}
565
566}
567/*]]>*/
568</script>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]569</head>
570<body>
571<div id="header">
572<h1>
573git-difftool(1) Manual Page
574</h1>
575<h2>NAME</h2>
576<div class="sectionbody">
577<p>git-difftool -
578 Show changes using common diff tools
579</p>
580</div>
581</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]582<div id="content">
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]583<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]584<div class="sectionbody">
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]585<div class="verseblock">
586<div class="verseblock-content"><em>git difftool</em> [&lt;options&gt;] [&lt;commit&gt; [&lt;commit&gt;]] [--] [&lt;path&gt;&#8230;]</div>
587<div class="verseblock-attribution">
588</div></div>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]589</div>
590<h2 id="_description">DESCRIPTION</h2>
591<div class="sectionbody">
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]592<div class="paragraph"><p><em>git difftool</em> is a git command that allows you to compare and edit files
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]593between revisions using common diff tools. <em>git difftool</em> is a frontend
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]594to <em>git diff</em> and accepts the same options and arguments. See
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]595<a href="git-diff.html">git-diff(1)</a>.</p></div>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]596</div>
597<h2 id="_options">OPTIONS</h2>
598<div class="sectionbody">
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]599<div class="dlist"><dl>
600<dt class="hdlist1">
Junio C Hamanobcdb12e2012-05-10 18:45:15[diff] [blame]601-d
602</dt>
603<dt class="hdlist1">
604--dir-diff
605</dt>
606<dd>
607<p>
608 Copy the modified files to a temporary location and perform
609 a directory diff on them. This mode never prompts before
610 launching the diff tool.
611</p>
612</dd>
613<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]614-y
615</dt>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]616<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]617--no-prompt
618</dt>
619<dd>
620<p>
621 Do not prompt before launching a diff tool.
622</p>
623</dd>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]624<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]625--prompt
626</dt>
627<dd>
628<p>
629 Prompt before each invocation of the diff tool.
630 This is the default behaviour; the option is provided to
631 override any configuration settings.
632</p>
633</dd>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]634<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]635-t &lt;tool&gt;
636</dt>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]637<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]638--tool=&lt;tool&gt;
639</dt>
640<dd>
641<p>
Junio C Hamanobcdb12e2012-05-10 18:45:15[diff] [blame]642 Use the diff tool specified by &lt;tool&gt;. Valid values include
643 emerge, kompare, meld, and vimdiff. Run <tt>git difftool --tool-help</tt>
644 for the list of valid &lt;tool&gt; settings.
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]645</p>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]646<div class="paragraph"><p>If a diff tool is not specified, <em>git difftool</em>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]647will use the configuration variable <tt>diff.tool</tt>. If the
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]648configuration variable <tt>diff.tool</tt> is not set, <em>git difftool</em>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]649will pick a suitable default.</p></div>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]650<div class="paragraph"><p>You can explicitly provide a full path to the tool by setting the
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]651configuration variable <tt>difftool.&lt;tool&gt;.path</tt>. For example, you
652can configure the absolute path to kdiff3 by setting
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]653<tt>difftool.kdiff3.path</tt>. Otherwise, <em>git difftool</em> assumes the
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]654tool is available in PATH.</p></div>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]655<div class="paragraph"><p>Instead of running one of the known diff tools,
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]656<em>git difftool</em> can be customized to run an alternative program
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]657by specifying the command line to invoke in a configuration
658variable <tt>difftool.&lt;tool&gt;.cmd</tt>.</p></div>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]659<div class="paragraph"><p>When <em>git difftool</em> is invoked with this tool (either through the
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]660<tt>-t</tt> or <tt>--tool</tt> option or the <tt>diff.tool</tt> configuration variable)
661the configured command line will be invoked with the following
662variables available: <tt>$LOCAL</tt> is set to the name of the temporary
663file containing the contents of the diff pre-image and <tt>$REMOTE</tt>
664is set to the name of the temporary file containing the contents
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]665of the diff post-image. <tt>$MERGED</tt> is the name of the file which is
666being compared. <tt>$BASE</tt> is provided for compatibility
667with custom merge tool commands and has the same value as <tt>$MERGED</tt>.</p></div>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]668</dd>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]669<dt class="hdlist1">
Junio C Hamanobcdb12e2012-05-10 18:45:15[diff] [blame]670--tool-help
671</dt>
672<dd>
673<p>
674 Print a list of diff tools that may be used with <tt>--tool</tt>.
675</p>
676</dd>
677<dt class="hdlist1">
Junio C Hamanoa00504d2012-08-27 21:11:23[diff] [blame]678--symlinks
679</dt>
680<dt class="hdlist1">
681--no-symlinks
682</dt>
683<dd>
684<p>
685 <em>git difftool</em>'s default behavior is create symlinks to the
686 working tree when run in <tt>--dir-diff</tt> mode.
687</p>
688<div class="literalblock">
689<div class="content">
690<pre><tt>Specifying `--no-symlinks` instructs 'git difftool' to create
691copies instead. `--no-symlinks` is the default on Windows.</tt></pre>
692</div></div>
693</dd>
694<dt class="hdlist1">
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]695-x &lt;command&gt;
696</dt>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]697<dt class="hdlist1">
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]698--extcmd=&lt;command&gt;
699</dt>
700<dd>
701<p>
702 Specify a custom command for viewing diffs.
703 <em>git-difftool</em> ignores the configured defaults and runs
704 <tt>$command $LOCAL $REMOTE</tt> when this option is specified.
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]705 Additionally, <tt>$BASE</tt> is set in the environment.
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]706</p>
707</dd>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]708<dt class="hdlist1">
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]709-g
710</dt>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]711<dt class="hdlist1">
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]712--gui
713</dt>
714<dd>
715<p>
716 When <em>git-difftool</em> is invoked with the <tt>-g</tt> or <tt>--gui</tt> option
717 the default diff tool will be read from the configured
718 <tt>diff.guitool</tt> variable instead of <tt>diff.tool</tt>.
719</p>
720</dd>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]721</dl></div>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]722<div class="paragraph"><p>See <a href="git-diff.html">git-diff(1)</a> for the full list of supported options.</p></div>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]723</div>
724<h2 id="_config_variables">CONFIG VARIABLES</h2>
725<div class="sectionbody">
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]726<div class="paragraph"><p><em>git difftool</em> falls back to <em>git mergetool</em> config variables when the
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]727difftool equivalents have not been defined.</p></div>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]728<div class="dlist"><dl>
729<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]730diff.tool
731</dt>
732<dd>
733<p>
734 The default diff tool to use.
735</p>
736</dd>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]737<dt class="hdlist1">
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]738diff.guitool
739</dt>
740<dd>
741<p>
742 The default diff tool to use when <tt>--gui</tt> is specified.
743</p>
744</dd>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]745<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]746difftool.&lt;tool&gt;.path
747</dt>
748<dd>
749<p>
750 Override the path for the given tool. This is useful in case
751 your tool is not in the PATH.
752</p>
753</dd>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]754<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]755difftool.&lt;tool&gt;.cmd
756</dt>
757<dd>
758<p>
759 Specify the command to invoke the specified diff tool.
760</p>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]761<div class="paragraph"><p>See the <tt>--tool=&lt;tool&gt;</tt> option above for more details.</p></div>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]762</dd>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]763<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]764difftool.prompt
765</dt>
766<dd>
767<p>
768 Prompt before each invocation of the diff tool.
769</p>
770</dd>
771</dl></div>
772</div>
773<h2 id="_see_also">SEE ALSO</h2>
774<div class="sectionbody">
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]775<div class="dlist"><dl>
776<dt class="hdlist1">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]777<a href="git-diff.html">git-diff(1)</a>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]778</dt>
779<dd>
780<p>
781 Show changes between commits, commit and working tree, etc
782</p>
783</dd>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]784<dt class="hdlist1">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]785<a href="git-mergetool.html">git-mergetool(1)</a>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]786</dt>
787<dd>
788<p>
789 Run merge conflict resolution tools to resolve merge conflicts
790</p>
791</dd>
Junio C Hamano2e6ded82010-12-05 06:20:48[diff] [blame]792<dt class="hdlist1">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]793<a href="git-config.html">git-config(1)</a>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]794</dt>
795<dd>
796<p>
797 Get and set repository or global options
798</p>
799</dd>
800</dl></div>
801</div>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]802<h2 id="_git">GIT</h2>
803<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]804<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]805</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]806</div>
807<div id="footnotes"><hr /></div>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]808<div id="footer">
809<div id="footer-text">
Junio C Hamanoa00504d2012-08-27 21:11:23[diff] [blame]810Last updated 2012-08-27 14:06:30 PDT
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]811</div>
812</div>
813</body>
814</html>