git-difftool.html

   1 <?xml version="1.0" encoding="UTF-8"?>
   2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   3     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
   4 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   5 <head>
   6 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
   7 <meta name="generator" content="AsciiDoc 10.2.0" />
   8 <title>git-difftool(1)</title>
   9 <style type="text/css">
  10 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
  11
  12 /* Default font. */
  13 body {
  14   font-family: Georgia,serif;
  15 }
  16
  17 /* Title font. */
  18 h1, h2, h3, h4, h5, h6,
  19 div.title, caption.title,
  20 thead, p.table.header,
  21 #toctitle,
  22 #author, #revnumber, #revdate, #revremark,
  23 #footer {
  24   font-family: Arial,Helvetica,sans-serif;
  25 }
  26
  27 body {
  28   margin: 1em 5% 1em 5%;
  29 }
  30
  31 a {
  32   color: blue;
  33   text-decoration: underline;
  34 }
  35 a:visited {
  36   color: fuchsia;
  37 }
  38
  39 em {
  40   font-style: italic;
  41   color: navy;
  42 }
  43
  44 strong {
  45   font-weight: bold;
  46   color: #083194;
  47 }
  48
  49 h1, h2, h3, h4, h5, h6 {
  50   color: #527bbd;
  51   margin-top: 1.2em;
  52   margin-bottom: 0.5em;
  53   line-height: 1.3;
  54 }
  55
  56 h1, h2, h3 {
  57   border-bottom: 2px solid silver;
  58 }
  59 h2 {
  60   padding-top: 0.5em;
  61 }
  62 h3 {
  63   float: left;
  64 }
  65 h3 + * {
  66   clear: left;
  67 }
  68 h5 {
  69   font-size: 1.0em;
  70 }
  71
  72 div.sectionbody {
  73   margin-left: 0;
  74 }
  75
  76 hr {
  77   border: 1px solid silver;
  78 }
  79
  80 p {
  81   margin-top: 0.5em;
  82   margin-bottom: 0.5em;
  83 }
  84
  85 ul, ol, li > p {
  86   margin-top: 0;
  87 }
  88 ul > li     { color: #aaa; }
  89 ul > li > * { color: black; }
  90
  91 .monospaced, code, pre {
  92   font-family: "Courier New", Courier, monospace;
  93   font-size: inherit;
  94   color: navy;
  95   padding: 0;
  96   margin: 0;
  97 }
  98 pre {
  99   white-space: pre-wrap;
 100 }
 101
 102 #author {
 103   color: #527bbd;
 104   font-weight: bold;
 105   font-size: 1.1em;
 106 }
 107 #email {
 108 }
 109 #revnumber, #revdate, #revremark {
 110 }
 111
 112 #footer {
 113   font-size: small;
 114   border-top: 2px solid silver;
 115   padding-top: 0.5em;
 116   margin-top: 4.0em;
 117 }
 118 #footer-text {
 119   float: left;
 120   padding-bottom: 0.5em;
 121 }
 122 #footer-badges {
 123   float: right;
 124   padding-bottom: 0.5em;
 125 }
 126
 127 #preamble {
 128   margin-top: 1.5em;
 129   margin-bottom: 1.5em;
 130 }
 131 div.imageblock, div.exampleblock, div.verseblock,
 132 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 133 div.admonitionblock {
 134   margin-top: 1.0em;
 135   margin-bottom: 1.5em;
 136 }
 137 div.admonitionblock {
 138   margin-top: 2.0em;
 139   margin-bottom: 2.0em;
 140   margin-right: 10%;
 141   color: #606060;
 142 }
 143
 144 div.content { /* Block element content. */
 145   padding: 0;
 146 }
 147
 148 /* Block element titles. */
 149 div.title, caption.title {
 150   color: #527bbd;
 151   font-weight: bold;
 152   text-align: left;
 153   margin-top: 1.0em;
 154   margin-bottom: 0.5em;
 155 }
 156 div.title + * {
 157   margin-top: 0;
 158 }
 159
 160 td div.title:first-child {
 161   margin-top: 0.0em;
 162 }
 163 div.content div.title:first-child {
 164   margin-top: 0.0em;
 165 }
 166 div.content + div.title {
 167   margin-top: 0.0em;
 168 }
 169
 170 div.sidebarblock > div.content {
 171   background: #ffffee;
 172   border: 1px solid #dddddd;
 173   border-left: 4px solid #f0f0f0;
 174   padding: 0.5em;
 175 }
 176
 177 div.listingblock > div.content {
 178   border: 1px solid #dddddd;
 179   border-left: 5px solid #f0f0f0;
 180   background: #f8f8f8;
 181   padding: 0.5em;
 182 }
 183
 184 div.quoteblock, div.verseblock {
 185   padding-left: 1.0em;
 186   margin-left: 1.0em;
 187   margin-right: 10%;
 188   border-left: 5px solid #f0f0f0;
 189   color: #888;
 190 }
 191
 192 div.quoteblock > div.attribution {
 193   padding-top: 0.5em;
 194   text-align: right;
 195 }
 196
 197 div.verseblock > pre.content {
 198   font-family: inherit;
 199   font-size: inherit;
 200 }
 201 div.verseblock > div.attribution {
 202   padding-top: 0.75em;
 203   text-align: left;
 204 }
 205 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
 206 div.verseblock + div.attribution {
 207   text-align: left;
 208 }
 209
 210 div.admonitionblock .icon {
 211   vertical-align: top;
 212   font-size: 1.1em;
 213   font-weight: bold;
 214   text-decoration: underline;
 215   color: #527bbd;
 216   padding-right: 0.5em;
 217 }
 218 div.admonitionblock td.content {
 219   padding-left: 0.5em;
 220   border-left: 3px solid #dddddd;
 221 }
 222
 223 div.exampleblock > div.content {
 224   border-left: 3px solid #dddddd;
 225   padding-left: 0.5em;
 226 }
 227
 228 div.imageblock div.content { padding-left: 0; }
 229 span.image img { border-style: none; vertical-align: text-bottom; }
 230 a.image:visited { color: white; }
 231
 232 dl {
 233   margin-top: 0.8em;
 234   margin-bottom: 0.8em;
 235 }
 236 dt {
 237   margin-top: 0.5em;
 238   margin-bottom: 0;
 239   font-style: normal;
 240   color: navy;
 241 }
 242 dd > *:first-child {
 243   margin-top: 0.1em;
 244 }
 245
 246 ul, ol {
 247     list-style-position: outside;
 248 }
 249 ol.arabic {
 250   list-style-type: decimal;
 251 }
 252 ol.loweralpha {
 253   list-style-type: lower-alpha;
 254 }
 255 ol.upperalpha {
 256   list-style-type: upper-alpha;
 257 }
 258 ol.lowerroman {
 259   list-style-type: lower-roman;
 260 }
 261 ol.upperroman {
 262   list-style-type: upper-roman;
 263 }
 264
 265 div.compact ul, div.compact ol,
 266 div.compact p, div.compact p,
 267 div.compact div, div.compact div {
 268   margin-top: 0.1em;
 269   margin-bottom: 0.1em;
 270 }
 271
 272 tfoot {
 273   font-weight: bold;
 274 }
 275 td > div.verse {
 276   white-space: pre;
 277 }
 278
 279 div.hdlist {
 280   margin-top: 0.8em;
 281   margin-bottom: 0.8em;
 282 }
 283 div.hdlist tr {
 284   padding-bottom: 15px;
 285 }
 286 dt.hdlist1.strong, td.hdlist1.strong {
 287   font-weight: bold;
 288 }
 289 td.hdlist1 {
 290   vertical-align: top;
 291   font-style: normal;
 292   padding-right: 0.8em;
 293   color: navy;
 294 }
 295 td.hdlist2 {
 296   vertical-align: top;
 297 }
 298 div.hdlist.compact tr {
 299   margin: 0;
 300   padding-bottom: 0;
 301 }
 302
 303 .comment {
 304   background: yellow;
 305 }
 306
 307 .footnote, .footnoteref {
 308   font-size: 0.8em;
 309 }
 310
 311 span.footnote, span.footnoteref {
 312   vertical-align: super;
 313 }
 314
 315 #footnotes {
 316   margin: 20px 0 20px 0;
 317   padding: 7px 0 0 0;
 318 }
 319
 320 #footnotes div.footnote {
 321   margin: 0 0 5px 0;
 322 }
 323
 324 #footnotes hr {
 325   border: none;
 326   border-top: 1px solid silver;
 327   height: 1px;
 328   text-align: left;
 329   margin-left: 0;
 330   width: 20%;
 331   min-width: 100px;
 332 }
 333
 334 div.colist td {
 335   padding-right: 0.5em;
 336   padding-bottom: 0.3em;
 337   vertical-align: top;
 338 }
 339 div.colist td img {
 340   margin-top: 0.3em;
 341 }
 342
 343 @media print {
 344   #footer-badges { display: none; }
 345 }
 346
 347 #toc {
 348   margin-bottom: 2.5em;
 349 }
 350
 351 #toctitle {
 352   color: #527bbd;
 353   font-size: 1.1em;
 354   font-weight: bold;
 355   margin-top: 1.0em;
 356   margin-bottom: 0.1em;
 357 }
 358
 359 div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
 360   margin-top: 0;
 361   margin-bottom: 0;
 362 }
 363 div.toclevel2 {
 364   margin-left: 2em;
 365   font-size: 0.9em;
 366 }
 367 div.toclevel3 {
 368   margin-left: 4em;
 369   font-size: 0.9em;
 370 }
 371 div.toclevel4 {
 372   margin-left: 6em;
 373   font-size: 0.9em;
 374 }
 375
 376 span.aqua { color: aqua; }
 377 span.black { color: black; }
 378 span.blue { color: blue; }
 379 span.fuchsia { color: fuchsia; }
 380 span.gray { color: gray; }
 381 span.green { color: green; }
 382 span.lime { color: lime; }
 383 span.maroon { color: maroon; }
 384 span.navy { color: navy; }
 385 span.olive { color: olive; }
 386 span.purple { color: purple; }
 387 span.red { color: red; }
 388 span.silver { color: silver; }
 389 span.teal { color: teal; }
 390 span.white { color: white; }
 391 span.yellow { color: yellow; }
 392
 393 span.aqua-background { background: aqua; }
 394 span.black-background { background: black; }
 395 span.blue-background { background: blue; }
 396 span.fuchsia-background { background: fuchsia; }
 397 span.gray-background { background: gray; }
 398 span.green-background { background: green; }
 399 span.lime-background { background: lime; }
 400 span.maroon-background { background: maroon; }
 401 span.navy-background { background: navy; }
 402 span.olive-background { background: olive; }
 403 span.purple-background { background: purple; }
 404 span.red-background { background: red; }
 405 span.silver-background { background: silver; }
 406 span.teal-background { background: teal; }
 407 span.white-background { background: white; }
 408 span.yellow-background { background: yellow; }
 409
 410 span.big { font-size: 2em; }
 411 span.small { font-size: 0.6em; }
 412
 413 span.underline { text-decoration: underline; }
 414 span.overline { text-decoration: overline; }
 415 span.line-through { text-decoration: line-through; }
 416
 417 div.unbreakable { page-break-inside: avoid; }
 418
 419
 420 /*
 421  * xhtml11 specific
 422  *
 423  * */
 424
 425 div.tableblock {
 426   margin-top: 1.0em;
 427   margin-bottom: 1.5em;
 428 }
 429 div.tableblock > table {
 430   border: 3px solid #527bbd;
 431 }
 432 thead, p.table.header {
 433   font-weight: bold;
 434   color: #527bbd;
 435 }
 436 p.table {
 437   margin-top: 0;
 438 }
 439 /* Because the table frame attribute is overridden by CSS in most browsers. */
 440 div.tableblock > table[frame="void"] {
 441   border-style: none;
 442 }
 443 div.tableblock > table[frame="hsides"] {
 444   border-left-style: none;
 445   border-right-style: none;
 446 }
 447 div.tableblock > table[frame="vsides"] {
 448   border-top-style: none;
 449   border-bottom-style: none;
 450 }
 451
 452
 453 /*
 454  * html5 specific
 455  *
 456  * */
 457
 458 table.tableblock {
 459   margin-top: 1.0em;
 460   margin-bottom: 1.5em;
 461 }
 462 thead, p.tableblock.header {
 463   font-weight: bold;
 464   color: #527bbd;
 465 }
 466 p.tableblock {
 467   margin-top: 0;
 468 }
 469 table.tableblock {
 470   border-width: 3px;
 471   border-spacing: 0px;
 472   border-style: solid;
 473   border-color: #527bbd;
 474   border-collapse: collapse;
 475 }
 476 th.tableblock, td.tableblock {
 477   border-width: 1px;
 478   padding: 4px;
 479   border-style: solid;
 480   border-color: #527bbd;
 481 }
 482
 483 table.tableblock.frame-topbot {
 484   border-left-style: hidden;
 485   border-right-style: hidden;
 486 }
 487 table.tableblock.frame-sides {
 488   border-top-style: hidden;
 489   border-bottom-style: hidden;
 490 }
 491 table.tableblock.frame-none {
 492   border-style: hidden;
 493 }
 494
 495 th.tableblock.halign-left, td.tableblock.halign-left {
 496   text-align: left;
 497 }
 498 th.tableblock.halign-center, td.tableblock.halign-center {
 499   text-align: center;
 500 }
 501 th.tableblock.halign-right, td.tableblock.halign-right {
 502   text-align: right;
 503 }
 504
 505 th.tableblock.valign-top, td.tableblock.valign-top {
 506   vertical-align: top;
 507 }
 508 th.tableblock.valign-middle, td.tableblock.valign-middle {
 509   vertical-align: middle;
 510 }
 511 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
 512   vertical-align: bottom;
 513 }
 514
 515
 516 /*
 517  * manpage specific
 518  *
 519  * */
 520
 521 body.manpage h1 {
 522   padding-top: 0.5em;
 523   padding-bottom: 0.5em;
 524   border-top: 2px solid silver;
 525   border-bottom: 2px solid silver;
 526 }
 527 body.manpage h2 {
 528   border-style: none;
 529 }
 530 body.manpage div.sectionbody {
 531   margin-left: 3em;
 532 }
 533
 534 @media print {
 535   body.manpage div#toc { display: none; }
 536 }
 537
 538
 539 </style>
 540 <script type="text/javascript">
 541 /*<![CDATA[*/
 542 var asciidoc = {  // Namespace.
 543
 544 /////////////////////////////////////////////////////////////////////
 545 // Table Of Contents generator
 546 /////////////////////////////////////////////////////////////////////
 547
 548 /* Author: Mihai Bazon, September 2002
 549  * http://students.infoiasi.ro/~mishoo
 550  *
 551  * Table Of Content generator
 552  * Version: 0.4
 553  *
 554  * Feel free to use this script under the terms of the GNU General Public
 555  * License, as long as you do not remove or alter this notice.
 556  */
 557
 558  /* modified by Troy D. Hanson, September 2006. License: GPL */
 559  /* modified by Stuart Rackham, 2006, 2009. License: GPL */
 560
 561 // toclevels = 1..4.
 562 toc: function (toclevels) {
 563
 564   function getText(el) {
 565     var text = "";
 566     for (var i = el.firstChild; i != null; i = i.nextSibling) {
 567       if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
 568         text += i.data;
 569       else if (i.firstChild != null)
 570         text += getText(i);
 571     }
 572     return text;
 573   }
 574
 575   function TocEntry(el, text, toclevel) {
 576     this.element = el;
 577     this.text = text;
 578     this.toclevel = toclevel;
 579   }
 580
 581   function tocEntries(el, toclevels) {
 582     var result = new Array;
 583     var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
 584     // Function that scans the DOM tree for header elements (the DOM2
 585     // nodeIterator API would be a better technique but not supported by all
 586     // browsers).
 587     var iterate = function (el) {
 588       for (var i = el.firstChild; i != null; i = i.nextSibling) {
 589         if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
 590           var mo = re.exec(i.tagName);
 591           if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
 592             result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
 593           }
 594           iterate(i);
 595         }
 596       }
 597     }
 598     iterate(el);
 599     return result;
 600   }
 601
 602   var toc = document.getElementById("toc");
 603   if (!toc) {
 604     return;
 605   }
 606
 607   // Delete existing TOC entries in case we're reloading the TOC.
 608   var tocEntriesToRemove = [];
 609   var i;
 610   for (i = 0; i < toc.childNodes.length; i++) {
 611     var entry = toc.childNodes[i];
 612     if (entry.nodeName.toLowerCase() == 'div'
 613      && entry.getAttribute("class")
 614      && entry.getAttribute("class").match(/^toclevel/))
 615       tocEntriesToRemove.push(entry);
 616   }
 617   for (i = 0; i < tocEntriesToRemove.length; i++) {
 618     toc.removeChild(tocEntriesToRemove[i]);
 619   }
 620
 621   // Rebuild TOC entries.
 622   var entries = tocEntries(document.getElementById("content"), toclevels);
 623   for (var i = 0; i < entries.length; ++i) {
 624     var entry = entries[i];
 625     if (entry.element.id == "")
 626       entry.element.id = "_toc_" + i;
 627     var a = document.createElement("a");
 628     a.href = "#" + entry.element.id;
 629     a.appendChild(document.createTextNode(entry.text));
 630     var div = document.createElement("div");
 631     div.appendChild(a);
 632     div.className = "toclevel" + entry.toclevel;
 633     toc.appendChild(div);
 634   }
 635   if (entries.length == 0)
 636     toc.parentNode.removeChild(toc);
 637 },
 638
 639
 640 /////////////////////////////////////////////////////////////////////
 641 // Footnotes generator
 642 /////////////////////////////////////////////////////////////////////
 643
 644 /* Based on footnote generation code from:
 645  * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
 646  */
 647
 648 footnotes: function () {
 649   // Delete existing footnote entries in case we're reloading the footnodes.
 650   var i;
 651   var noteholder = document.getElementById("footnotes");
 652   if (!noteholder) {
 653     return;
 654   }
 655   var entriesToRemove = [];
 656   for (i = 0; i < noteholder.childNodes.length; i++) {
 657     var entry = noteholder.childNodes[i];
 658     if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
 659       entriesToRemove.push(entry);
 660   }
 661   for (i = 0; i < entriesToRemove.length; i++) {
 662     noteholder.removeChild(entriesToRemove[i]);
 663   }
 664
 665   // Rebuild footnote entries.
 666   var cont = document.getElementById("content");
 667   var spans = cont.getElementsByTagName("span");
 668   var refs = {};
 669   var n = 0;
 670   for (i=0; i<spans.length; i++) {
 671     if (spans[i].className == "footnote") {
 672       n++;
 673       var note = spans[i].getAttribute("data-note");
 674       if (!note) {
 675         // Use [\s\S] in place of . so multi-line matches work.
 676         // Because JavaScript has no s (dotall) regex flag.
 677         note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
 678         spans[i].innerHTML =
 679           "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
 680           "' title='View footnote' class='footnote'>" + n + "</a>]";
 681         spans[i].setAttribute("data-note", note);
 682       }
 683       noteholder.innerHTML +=
 684         "<div class='footnote' id='_footnote_" + n + "'>" +
 685         "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
 686         n + "</a>. " + note + "</div>";
 687       var id =spans[i].getAttribute("id");
 688       if (id != null) refs["#"+id] = n;
 689     }
 690   }
 691   if (n == 0)
 692     noteholder.parentNode.removeChild(noteholder);
 693   else {
 694     // Process footnoterefs.
 695     for (i=0; i<spans.length; i++) {
 696       if (spans[i].className == "footnoteref") {
 697         var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
 698         href = href.match(/#.*/)[0];  // Because IE return full URL.
 699         n = refs[href];
 700         spans[i].innerHTML =
 701           "[<a href='#_footnote_" + n +
 702           "' title='View footnote' class='footnote'>" + n + "</a>]";
 703       }
 704     }
 705   }
 706 },
 707
 708 install: function(toclevels) {
 709   var timerId;
 710
 711   function reinstall() {
 712     asciidoc.footnotes();
 713     if (toclevels) {
 714       asciidoc.toc(toclevels);
 715     }
 716   }
 717
 718   function reinstallAndRemoveTimer() {
 719     clearInterval(timerId);
 720     reinstall();
 721   }
 722
 723   timerId = setInterval(reinstall, 500);
 724   if (document.addEventListener)
 725     document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
 726   else
 727     window.onload = reinstallAndRemoveTimer;
 728 }
 729
 730 }
 731 asciidoc.install();
 732 /*]]>*/
 733 </script>
 734 </head>
 735 <body class="manpage">
 736 <div id="header">
 737 <h1>
 738 git-difftool(1) Manual Page
 739 </h1>
 740 <h2>NAME</h2>
 741 <div class="sectionbody">
 742 <p>git-difftool -
 743    Show changes using common diff tools
 744 </p>
 745 </div>
 746 </div>
 747 <div id="content">
 748 <div class="sect1">
 749 <h2 id="_synopsis">SYNOPSIS</h2>
 750 <div class="sectionbody">
 751 <div class="verseblock">
 752 <pre class="content"><em>git difftool</em> [&lt;options&gt;] [&lt;commit&gt; [&lt;commit&gt;]] [--] [&lt;path&gt;&#8230;]</pre>
 753 <div class="attribution">
 754 </div></div>
 755 </div>
 756 </div>
 757 <div class="sect1">
 758 <h2 id="_description">DESCRIPTION</h2>
 759 <div class="sectionbody">
 760 <div class="paragraph"><p><em>git difftool</em> is a Git command that allows you to compare and edit files
 761 between revisions using common diff tools.  <em>git difftool</em> is a frontend
 762 to <em>git diff</em> and accepts the same options and arguments. See
 763 <a href="git-diff.html">git-diff(1)</a>.</p></div>
 764 </div>
 765 </div>
 766 <div class="sect1">
 767 <h2 id="_options">OPTIONS</h2>
 768 <div class="sectionbody">
 769 <div class="dlist"><dl>
 770 <dt class="hdlist1">
 771 -d
 772 </dt>
 773 <dt class="hdlist1">
 774 --dir-diff
 775 </dt>
 776 <dd>
 777 <p>
 778         Copy the modified files to a temporary location and perform
 779         a directory diff on them. This mode never prompts before
 780         launching the diff tool.
 781 </p>
 782 </dd>
 783 <dt class="hdlist1">
 784 -y
 785 </dt>
 786 <dt class="hdlist1">
 787 --no-prompt
 788 </dt>
 789 <dd>
 790 <p>
 791         Do not prompt before launching a diff tool.
 792 </p>
 793 </dd>
 794 <dt class="hdlist1">
 795 --prompt
 796 </dt>
 797 <dd>
 798 <p>
 799         Prompt before each invocation of the diff tool.
 800         This is the default behaviour; the option is provided to
 801         override any configuration settings.
 802 </p>
 803 </dd>
 804 <dt class="hdlist1">
 805 --rotate-to=&lt;file&gt;
 806 </dt>
 807 <dd>
 808 <p>
 809         Start showing the diff for the given path,
 810         the paths before it will move to the end and output.
 811 </p>
 812 </dd>
 813 <dt class="hdlist1">
 814 --skip-to=&lt;file&gt;
 815 </dt>
 816 <dd>
 817 <p>
 818         Start showing the diff for the given path, skipping all
 819         the paths before it.
 820 </p>
 821 </dd>
 822 <dt class="hdlist1">
 823 -t &lt;tool&gt;
 824 </dt>
 825 <dt class="hdlist1">
 826 --tool=&lt;tool&gt;
 827 </dt>
 828 <dd>
 829 <p>
 830         Use the diff tool specified by &lt;tool&gt;.  Valid values include
 831         emerge, kompare, meld, and vimdiff. Run <code>git difftool --tool-help</code>
 832         for the list of valid &lt;tool&gt; settings.
 833 </p>
 834 <div class="paragraph"><p>If a diff tool is not specified, <em>git difftool</em>
 835 will use the configuration variable <code>diff.tool</code>.  If the
 836 configuration variable <code>diff.tool</code> is not set, <em>git difftool</em>
 837 will pick a suitable default.</p></div>
 838 <div class="paragraph"><p>You can explicitly provide a full path to the tool by setting the
 839 configuration variable <code>difftool.&lt;tool&gt;.path</code>. For example, you
 840 can configure the absolute path to kdiff3 by setting
 841 <code>difftool.kdiff3.path</code>. Otherwise, <em>git difftool</em> assumes the
 842 tool is available in PATH.</p></div>
 843 <div class="paragraph"><p>Instead of running one of the known diff tools,
 844 <em>git difftool</em> can be customized to run an alternative program
 845 by specifying the command line to invoke in a configuration
 846 variable <code>difftool.&lt;tool&gt;.cmd</code>.</p></div>
 847 <div class="paragraph"><p>When <em>git difftool</em> is invoked with this tool (either through the
 848 <code>-t</code> or <code>--tool</code> option or the <code>diff.tool</code> configuration variable)
 849 the configured command line will be invoked with the following
 850 variables available: <code>$LOCAL</code> is set to the name of the temporary
 851 file containing the contents of the diff pre-image and <code>$REMOTE</code>
 852 is set to the name of the temporary file containing the contents
 853 of the diff post-image.  <code>$MERGED</code> is the name of the file which is
 854 being compared. <code>$BASE</code> is provided for compatibility
 855 with custom merge tool commands and has the same value as <code>$MERGED</code>.</p></div>
 856 </dd>
 857 <dt class="hdlist1">
 858 --tool-help
 859 </dt>
 860 <dd>
 861 <p>
 862         Print a list of diff tools that may be used with <code>--tool</code>.
 863 </p>
 864 </dd>
 865 <dt class="hdlist1">
 866 --[no-]symlinks
 867 </dt>
 868 <dd>
 869 <p>
 870         <em>git difftool</em>'s default behavior is to create symlinks to the
 871         working tree when run in <code>--dir-diff</code> mode and the right-hand
 872         side of the comparison yields the same content as the file in
 873         the working tree.
 874 </p>
 875 <div class="paragraph"><p>Specifying <code>--no-symlinks</code> instructs <em>git difftool</em> to create copies
 876 instead.  <code>--no-symlinks</code> is the default on Windows.</p></div>
 877 </dd>
 878 <dt class="hdlist1">
 879 -x &lt;command&gt;
 880 </dt>
 881 <dt class="hdlist1">
 882 --extcmd=&lt;command&gt;
 883 </dt>
 884 <dd>
 885 <p>
 886         Specify a custom command for viewing diffs.
 887         <em>git-difftool</em> ignores the configured defaults and runs
 888         <code>&lt;command&gt; $LOCAL $REMOTE</code> when this option is specified.
 889         Additionally, <code>$BASE</code> is set in the environment.
 890 </p>
 891 </dd>
 892 <dt class="hdlist1">
 893 -g
 894 </dt>
 895 <dt class="hdlist1">
 896 --[no-]gui
 897 </dt>
 898 <dd>
 899 <p>
 900         When <em>git-difftool</em> is invoked with the <code>-g</code> or <code>--gui</code> option
 901         the default diff tool will be read from the configured
 902         <code>diff.guitool</code> variable instead of <code>diff.tool</code>. This may be
 903         selected automatically using the configuration variable
 904         <code>difftool.guiDefault</code>. The <code>--no-gui</code> option can be used to
 905         override these settings. If <code>diff.guitool</code> is not set, we will
 906         fallback in the order of <code>merge.guitool</code>, <code>diff.tool</code>,
 907         <code>merge.tool</code> until a tool is found.
 908 </p>
 909 </dd>
 910 <dt class="hdlist1">
 911 --[no-]trust-exit-code
 912 </dt>
 913 <dd>
 914 <p>
 915         Errors reported by the diff tool are ignored by default.
 916         Use <code>--trust-exit-code</code> to make <em>git-difftool</em> exit when an
 917         invoked diff tool returns a non-zero exit code.
 918 </p>
 919 <div class="paragraph"><p><em>git-difftool</em> will forward the exit code of the invoked tool when
 920 <code>--trust-exit-code</code> is used.</p></div>
 921 </dd>
 922 </dl></div>
 923 <div class="paragraph"><p>See <a href="git-diff.html">git-diff(1)</a> for the full list of supported options.</p></div>
 924 </div>
 925 </div>
 926 <div class="sect1">
 927 <h2 id="_configuration">CONFIGURATION</h2>
 928 <div class="sectionbody">
 929 <div class="paragraph"><p><em>git difftool</em> falls back to <em>git mergetool</em> config variables when the
 930 difftool equivalents have not been defined.</p></div>
 931 <div class="paragraph"><p>Everything above this line in this section isn&#8217;t included from the
 932 <a href="git-config.html">git-config(1)</a> documentation. The content that follows is the
 933 same as what&#8217;s found there:</p></div>
 934 <div class="dlist"><dl>
 935 <dt class="hdlist1">
 936 diff.tool
 937 </dt>
 938 <dd>
 939 <p>
 940         Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a>.
 941         This variable overrides the value configured in <code>merge.tool</code>.
 942         The list below shows the valid built-in values.
 943         Any other value is treated as a custom diff tool and requires
 944         that a corresponding difftool.&lt;tool&gt;.cmd variable is defined.
 945 </p>
 946 </dd>
 947 <dt class="hdlist1">
 948 diff.guitool
 949 </dt>
 950 <dd>
 951 <p>
 952         Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a> when
 953         the -g/--gui flag is specified. This variable overrides the value
 954         configured in <code>merge.guitool</code>. The list below shows the valid
 955         built-in values. Any other value is treated as a custom diff tool
 956         and requires that a corresponding difftool.&lt;guitool&gt;.cmd variable
 957         is defined.
 958 </p>
 959 </dd>
 960 <dt class="hdlist1">
 961 difftool.&lt;tool&gt;.cmd
 962 </dt>
 963 <dd>
 964 <p>
 965         Specify the command to invoke the specified diff tool.
 966         The specified command is evaluated in shell with the following
 967         variables available:  <em>LOCAL</em> is set to the name of the temporary
 968         file containing the contents of the diff pre-image and <em>REMOTE</em>
 969         is set to the name of the temporary file containing the contents
 970         of the diff post-image.
 971 </p>
 972 <div class="paragraph"><p>See the <code>--tool=&lt;tool&gt;</code> option in <a href="git-difftool.html">git-difftool(1)</a> for more details.</p></div>
 973 </dd>
 974 <dt class="hdlist1">
 975 difftool.&lt;tool&gt;.path
 976 </dt>
 977 <dd>
 978 <p>
 979         Override the path for the given tool.  This is useful in case
 980         your tool is not in the PATH.
 981 </p>
 982 </dd>
 983 <dt class="hdlist1">
 984 difftool.trustExitCode
 985 </dt>
 986 <dd>
 987 <p>
 988         Exit difftool if the invoked diff tool returns a non-zero exit status.
 989 </p>
 990 <div class="paragraph"><p>See the <code>--trust-exit-code</code> option in <a href="git-difftool.html">git-difftool(1)</a> for more details.</p></div>
 991 </dd>
 992 <dt class="hdlist1">
 993 difftool.prompt
 994 </dt>
 995 <dd>
 996 <p>
 997         Prompt before each invocation of the diff tool.
 998 </p>
 999 </dd>
1000 <dt class="hdlist1">
1001 difftool.guiDefault
1002 </dt>
1003 <dd>
1004 <p>
1005         Set <code>true</code> to use the <code>diff.guitool</code> by default (equivalent to specifying
1006         the <code>--gui</code> argument), or <code>auto</code> to select <code>diff.guitool</code> or <code>diff.tool</code>
1007         depending on the presence of a <code>DISPLAY</code> environment variable value. The
1008         default is <code>false</code>, where the <code>--gui</code> argument must be provided
1009         explicitly for the <code>diff.guitool</code> to be used.
1010 </p>
1011 </dd>
1012 </dl></div>
1013 </div>
1014 </div>
1015 <div class="sect1">
1016 <h2 id="_see_also">SEE ALSO</h2>
1017 <div class="sectionbody">
1018 <div class="dlist"><dl>
1019 <dt class="hdlist1">
1020 <a href="git-diff.html">git-diff(1)</a>
1021 </dt>
1022 <dd>
1023 <p>
1024          Show changes between commits, commit and working tree, etc
1025 </p>
1026 </dd>
1027 <dt class="hdlist1">
1028 <a href="git-mergetool.html">git-mergetool(1)</a>
1029 </dt>
1030 <dd>
1031 <p>
1032         Run merge conflict resolution tools to resolve merge conflicts
1033 </p>
1034 </dd>
1035 <dt class="hdlist1">
1036 <a href="git-config.html">git-config(1)</a>
1037 </dt>
1038 <dd>
1039 <p>
1040          Get and set repository or global options
1041 </p>
1042 </dd>
1043 </dl></div>
1044 </div>
1045 </div>
1046 <div class="sect1">
1047 <h2 id="_git">GIT</h2>
1048 <div class="sectionbody">
1049 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
1050 </div>
1051 </div>
1052 </div>
1053 <div id="footnotes"><hr /></div>
1054 <div id="footer">
1055 <div id="footer-text">
1056 Last updated
1057  2024-03-01 17:30:58 PST
1058 </div>
1059 </div>
1060 </body>
1061 </html>