1263 lines
29 KiB
HTML
1263 lines
29 KiB
HTML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
|
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
<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 10.2.0" />
|
|
<title>git-difftool(1)</title>
|
|
<style type="text/css">
|
|
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
|
|
|
|
/* Default font. */
|
|
body {
|
|
font-family: Georgia,serif;
|
|
}
|
|
|
|
/* Title font. */
|
|
h1, h2, h3, h4, h5, h6,
|
|
div.title, caption.title,
|
|
thead, p.table.header,
|
|
#toctitle,
|
|
#author, #revnumber, #revdate, #revremark,
|
|
#footer {
|
|
font-family: Arial,Helvetica,sans-serif;
|
|
}
|
|
|
|
body {
|
|
margin: 1em 5% 1em 5%;
|
|
}
|
|
|
|
a {
|
|
color: blue;
|
|
text-decoration: underline;
|
|
}
|
|
a:visited {
|
|
color: fuchsia;
|
|
}
|
|
|
|
em {
|
|
font-style: italic;
|
|
color: navy;
|
|
}
|
|
|
|
strong {
|
|
font-weight: bold;
|
|
color: #083194;
|
|
}
|
|
|
|
h1, h2, h3, h4, h5, h6 {
|
|
color: #527bbd;
|
|
margin-top: 1.2em;
|
|
margin-bottom: 0.5em;
|
|
line-height: 1.3;
|
|
}
|
|
|
|
h1, h2, h3 {
|
|
border-bottom: 2px solid silver;
|
|
}
|
|
h2 {
|
|
padding-top: 0.5em;
|
|
}
|
|
h3 {
|
|
float: left;
|
|
}
|
|
h3 + * {
|
|
clear: left;
|
|
}
|
|
h5 {
|
|
font-size: 1.0em;
|
|
}
|
|
|
|
div.sectionbody {
|
|
margin-left: 0;
|
|
}
|
|
|
|
hr {
|
|
border: 1px solid silver;
|
|
}
|
|
|
|
p {
|
|
margin-top: 0.5em;
|
|
margin-bottom: 0.5em;
|
|
}
|
|
|
|
ul, ol, li > p {
|
|
margin-top: 0;
|
|
}
|
|
ul > li { color: #aaa; }
|
|
ul > li > * { color: black; }
|
|
|
|
.monospaced, code, pre {
|
|
font-family: "Courier New", Courier, monospace;
|
|
font-size: inherit;
|
|
color: navy;
|
|
padding: 0;
|
|
margin: 0;
|
|
}
|
|
pre {
|
|
white-space: pre-wrap;
|
|
}
|
|
|
|
#author {
|
|
color: #527bbd;
|
|
font-weight: bold;
|
|
font-size: 1.1em;
|
|
}
|
|
#email {
|
|
}
|
|
#revnumber, #revdate, #revremark {
|
|
}
|
|
|
|
#footer {
|
|
font-size: small;
|
|
border-top: 2px solid silver;
|
|
padding-top: 0.5em;
|
|
margin-top: 4.0em;
|
|
}
|
|
#footer-text {
|
|
float: left;
|
|
padding-bottom: 0.5em;
|
|
}
|
|
#footer-badges {
|
|
float: right;
|
|
padding-bottom: 0.5em;
|
|
}
|
|
|
|
#preamble {
|
|
margin-top: 1.5em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.imageblock, div.exampleblock, div.verseblock,
|
|
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
|
|
div.admonitionblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.admonitionblock {
|
|
margin-top: 2.0em;
|
|
margin-bottom: 2.0em;
|
|
margin-right: 10%;
|
|
color: #606060;
|
|
}
|
|
|
|
div.content { /* Block element content. */
|
|
padding: 0;
|
|
}
|
|
|
|
/* Block element titles. */
|
|
div.title, caption.title {
|
|
color: #527bbd;
|
|
font-weight: bold;
|
|
text-align: left;
|
|
margin-top: 1.0em;
|
|
margin-bottom: 0.5em;
|
|
}
|
|
div.title + * {
|
|
margin-top: 0;
|
|
}
|
|
|
|
td div.title:first-child {
|
|
margin-top: 0.0em;
|
|
}
|
|
div.content div.title:first-child {
|
|
margin-top: 0.0em;
|
|
}
|
|
div.content + div.title {
|
|
margin-top: 0.0em;
|
|
}
|
|
|
|
div.sidebarblock > div.content {
|
|
background: #ffffee;
|
|
border: 1px solid #dddddd;
|
|
border-left: 4px solid #f0f0f0;
|
|
padding: 0.5em;
|
|
}
|
|
|
|
div.listingblock > div.content {
|
|
border: 1px solid #dddddd;
|
|
border-left: 5px solid #f0f0f0;
|
|
background: #f8f8f8;
|
|
padding: 0.5em;
|
|
}
|
|
|
|
div.quoteblock, div.verseblock {
|
|
padding-left: 1.0em;
|
|
margin-left: 1.0em;
|
|
margin-right: 10%;
|
|
border-left: 5px solid #f0f0f0;
|
|
color: #888;
|
|
}
|
|
|
|
div.quoteblock > div.attribution {
|
|
padding-top: 0.5em;
|
|
text-align: right;
|
|
}
|
|
|
|
div.verseblock > pre.content {
|
|
font-family: inherit;
|
|
font-size: inherit;
|
|
}
|
|
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;
|
|
}
|
|
|
|
div.admonitionblock .icon {
|
|
vertical-align: top;
|
|
font-size: 1.1em;
|
|
font-weight: bold;
|
|
text-decoration: underline;
|
|
color: #527bbd;
|
|
padding-right: 0.5em;
|
|
}
|
|
div.admonitionblock td.content {
|
|
padding-left: 0.5em;
|
|
border-left: 3px solid #dddddd;
|
|
}
|
|
|
|
div.exampleblock > div.content {
|
|
border-left: 3px solid #dddddd;
|
|
padding-left: 0.5em;
|
|
}
|
|
|
|
div.imageblock div.content { padding-left: 0; }
|
|
span.image img { border-style: none; vertical-align: text-bottom; }
|
|
a.image:visited { color: white; }
|
|
|
|
dl {
|
|
margin-top: 0.8em;
|
|
margin-bottom: 0.8em;
|
|
}
|
|
dt {
|
|
margin-top: 0.5em;
|
|
margin-bottom: 0;
|
|
font-style: normal;
|
|
color: navy;
|
|
}
|
|
dd > *:first-child {
|
|
margin-top: 0.1em;
|
|
}
|
|
|
|
ul, ol {
|
|
list-style-position: outside;
|
|
}
|
|
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;
|
|
}
|
|
|
|
tfoot {
|
|
font-weight: bold;
|
|
}
|
|
td > div.verse {
|
|
white-space: pre;
|
|
}
|
|
|
|
div.hdlist {
|
|
margin-top: 0.8em;
|
|
margin-bottom: 0.8em;
|
|
}
|
|
div.hdlist tr {
|
|
padding-bottom: 15px;
|
|
}
|
|
dt.hdlist1.strong, td.hdlist1.strong {
|
|
font-weight: bold;
|
|
}
|
|
td.hdlist1 {
|
|
vertical-align: top;
|
|
font-style: normal;
|
|
padding-right: 0.8em;
|
|
color: navy;
|
|
}
|
|
td.hdlist2 {
|
|
vertical-align: top;
|
|
}
|
|
div.hdlist.compact tr {
|
|
margin: 0;
|
|
padding-bottom: 0;
|
|
}
|
|
|
|
.comment {
|
|
background: yellow;
|
|
}
|
|
|
|
.footnote, .footnoteref {
|
|
font-size: 0.8em;
|
|
}
|
|
|
|
span.footnote, span.footnoteref {
|
|
vertical-align: super;
|
|
}
|
|
|
|
#footnotes {
|
|
margin: 20px 0 20px 0;
|
|
padding: 7px 0 0 0;
|
|
}
|
|
|
|
#footnotes div.footnote {
|
|
margin: 0 0 5px 0;
|
|
}
|
|
|
|
#footnotes hr {
|
|
border: none;
|
|
border-top: 1px solid silver;
|
|
height: 1px;
|
|
text-align: left;
|
|
margin-left: 0;
|
|
width: 20%;
|
|
min-width: 100px;
|
|
}
|
|
|
|
div.colist td {
|
|
padding-right: 0.5em;
|
|
padding-bottom: 0.3em;
|
|
vertical-align: top;
|
|
}
|
|
div.colist td img {
|
|
margin-top: 0.3em;
|
|
}
|
|
|
|
@media print {
|
|
#footer-badges { display: none; }
|
|
}
|
|
|
|
#toc {
|
|
margin-bottom: 2.5em;
|
|
}
|
|
|
|
#toctitle {
|
|
color: #527bbd;
|
|
font-size: 1.1em;
|
|
font-weight: bold;
|
|
margin-top: 1.0em;
|
|
margin-bottom: 0.1em;
|
|
}
|
|
|
|
div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
|
|
margin-top: 0;
|
|
margin-bottom: 0;
|
|
}
|
|
div.toclevel2 {
|
|
margin-left: 2em;
|
|
font-size: 0.9em;
|
|
}
|
|
div.toclevel3 {
|
|
margin-left: 4em;
|
|
font-size: 0.9em;
|
|
}
|
|
div.toclevel4 {
|
|
margin-left: 6em;
|
|
font-size: 0.9em;
|
|
}
|
|
|
|
span.aqua { color: aqua; }
|
|
span.black { color: black; }
|
|
span.blue { color: blue; }
|
|
span.fuchsia { color: fuchsia; }
|
|
span.gray { color: gray; }
|
|
span.green { color: green; }
|
|
span.lime { color: lime; }
|
|
span.maroon { color: maroon; }
|
|
span.navy { color: navy; }
|
|
span.olive { color: olive; }
|
|
span.purple { color: purple; }
|
|
span.red { color: red; }
|
|
span.silver { color: silver; }
|
|
span.teal { color: teal; }
|
|
span.white { color: white; }
|
|
span.yellow { color: yellow; }
|
|
|
|
span.aqua-background { background: aqua; }
|
|
span.black-background { background: black; }
|
|
span.blue-background { background: blue; }
|
|
span.fuchsia-background { background: fuchsia; }
|
|
span.gray-background { background: gray; }
|
|
span.green-background { background: green; }
|
|
span.lime-background { background: lime; }
|
|
span.maroon-background { background: maroon; }
|
|
span.navy-background { background: navy; }
|
|
span.olive-background { background: olive; }
|
|
span.purple-background { background: purple; }
|
|
span.red-background { background: red; }
|
|
span.silver-background { background: silver; }
|
|
span.teal-background { background: teal; }
|
|
span.white-background { background: white; }
|
|
span.yellow-background { background: yellow; }
|
|
|
|
span.big { font-size: 2em; }
|
|
span.small { font-size: 0.6em; }
|
|
|
|
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
|
|
*
|
|
* */
|
|
|
|
div.tableblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.tableblock > table {
|
|
border: 3px solid #527bbd;
|
|
}
|
|
thead, p.table.header {
|
|
font-weight: bold;
|
|
color: #527bbd;
|
|
}
|
|
p.table {
|
|
margin-top: 0;
|
|
}
|
|
/* Because the table frame attribute is overridden 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;
|
|
}
|
|
|
|
|
|
/*
|
|
* html5 specific
|
|
*
|
|
* */
|
|
|
|
table.tableblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
thead, p.tableblock.header {
|
|
font-weight: bold;
|
|
color: #527bbd;
|
|
}
|
|
p.tableblock {
|
|
margin-top: 0;
|
|
}
|
|
table.tableblock {
|
|
border-width: 3px;
|
|
border-spacing: 0px;
|
|
border-style: solid;
|
|
border-color: #527bbd;
|
|
border-collapse: collapse;
|
|
}
|
|
th.tableblock, td.tableblock {
|
|
border-width: 1px;
|
|
padding: 4px;
|
|
border-style: solid;
|
|
border-color: #527bbd;
|
|
}
|
|
|
|
table.tableblock.frame-topbot {
|
|
border-left-style: hidden;
|
|
border-right-style: hidden;
|
|
}
|
|
table.tableblock.frame-sides {
|
|
border-top-style: hidden;
|
|
border-bottom-style: hidden;
|
|
}
|
|
table.tableblock.frame-none {
|
|
border-style: hidden;
|
|
}
|
|
|
|
th.tableblock.halign-left, td.tableblock.halign-left {
|
|
text-align: left;
|
|
}
|
|
th.tableblock.halign-center, td.tableblock.halign-center {
|
|
text-align: center;
|
|
}
|
|
th.tableblock.halign-right, td.tableblock.halign-right {
|
|
text-align: right;
|
|
}
|
|
|
|
th.tableblock.valign-top, td.tableblock.valign-top {
|
|
vertical-align: top;
|
|
}
|
|
th.tableblock.valign-middle, td.tableblock.valign-middle {
|
|
vertical-align: middle;
|
|
}
|
|
th.tableblock.valign-bottom, td.tableblock.valign-bottom {
|
|
vertical-align: bottom;
|
|
}
|
|
|
|
|
|
/*
|
|
* manpage specific
|
|
*
|
|
* */
|
|
|
|
body.manpage h1 {
|
|
padding-top: 0.5em;
|
|
padding-bottom: 0.5em;
|
|
border-top: 2px solid silver;
|
|
border-bottom: 2px solid silver;
|
|
}
|
|
body.manpage h2 {
|
|
border-style: none;
|
|
}
|
|
body.manpage div.sectionbody {
|
|
margin-left: 3em;
|
|
}
|
|
|
|
@media print {
|
|
body.manpage div#toc { display: none; }
|
|
}
|
|
|
|
|
|
</style>
|
|
<script type="text/javascript">
|
|
/*<+'])');
|
|
// Function that scans the DOM tree for header elements (the DOM2
|
|
// nodeIterator API would be a better technique but not supported by all
|
|
// browsers).
|
|
var iterate = function (el) {
|
|
for (var i = el.firstChild; i != null; i = i.nextSibling) {
|
|
if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
|
|
var mo = re.exec(i.tagName);
|
|
if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
|
|
result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
|
|
}
|
|
iterate(i);
|
|
}
|
|
}
|
|
}
|
|
iterate(el);
|
|
return result;
|
|
}
|
|
|
|
var toc = document.getElementById("toc");
|
|
if (!toc) {
|
|
return;
|
|
}
|
|
|
|
// Delete existing TOC entries in case we're reloading the TOC.
|
|
var tocEntriesToRemove = [];
|
|
var i;
|
|
for (i = 0; i < toc.childNodes.length; i++) {
|
|
var entry = toc.childNodes[i];
|
|
if (entry.nodeName.toLowerCase() == 'div'
|
|
&& entry.getAttribute("class")
|
|
&& entry.getAttribute("class").match(/^toclevel/))
|
|
tocEntriesToRemove.push(entry);
|
|
}
|
|
for (i = 0; i < tocEntriesToRemove.length; i++) {
|
|
toc.removeChild(tocEntriesToRemove[i]);
|
|
}
|
|
|
|
// Rebuild TOC entries.
|
|
var entries = tocEntries(document.getElementById("content"), toclevels);
|
|
for (var i = 0; i < entries.length; ++i) {
|
|
var entry = entries[i];
|
|
if (entry.element.id == "")
|
|
entry.element.id = "_toc_" + i;
|
|
var a = document.createElement("a");
|
|
a.href = "#" + entry.element.id;
|
|
a.appendChild(document.createTextNode(entry.text));
|
|
var div = document.createElement("div");
|
|
div.appendChild(a);
|
|
div.className = "toclevel" + entry.toclevel;
|
|
toc.appendChild(div);
|
|
}
|
|
if (entries.length == 0)
|
|
toc.parentNode.removeChild(toc);
|
|
},
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
// Footnotes generator
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
/* Based on footnote generation code from:
|
|
* http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
|
|
*/
|
|
|
|
footnotes: function () {
|
|
// Delete existing footnote entries in case we're reloading the footnodes.
|
|
var i;
|
|
var noteholder = document.getElementById("footnotes");
|
|
if (!noteholder) {
|
|
return;
|
|
}
|
|
var entriesToRemove = [];
|
|
for (i = 0; i < noteholder.childNodes.length; i++) {
|
|
var entry = noteholder.childNodes[i];
|
|
if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
|
|
entriesToRemove.push(entry);
|
|
}
|
|
for (i = 0; i < entriesToRemove.length; i++) {
|
|
noteholder.removeChild(entriesToRemove[i]);
|
|
}
|
|
|
|
// Rebuild footnote entries.
|
|
var cont = document.getElementById("content");
|
|
var spans = cont.getElementsByTagName("span");
|
|
var refs = {};
|
|
var n = 0;
|
|
for (i=0; i<spans.length; i++) {
|
|
if (spans[i].className == "footnote") {
|
|
n++;
|
|
var note = spans[i].getAttribute("data-note");
|
|
if (!note) {
|
|
// Use [\s\S] in place of . so multi-line matches work.
|
|
// Because JavaScript has no s (dotall) regex flag.
|
|
note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
|
|
spans[i].innerHTML =
|
|
"[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
|
|
"' title='View footnote' class='footnote'>" + n + "</a>]";
|
|
spans[i].setAttribute("data-note", note);
|
|
}
|
|
noteholder.innerHTML +=
|
|
"<div class='footnote' id='_footnote_" + n + "'>" +
|
|
"<a href='#_footnoteref_" + n + "' title='Return to text'>" +
|
|
n + "</a>. " + note + "</div>";
|
|
var id =spans[i].getAttribute("id");
|
|
if (id != null) refs["#"+id] = n;
|
|
}
|
|
}
|
|
if (n == 0)
|
|
noteholder.parentNode.removeChild(noteholder);
|
|
else {
|
|
// Process footnoterefs.
|
|
for (i=0; i<spans.length; i++) {
|
|
if (spans[i].className == "footnoteref") {
|
|
var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
|
|
href = href.match(/#.*/)[0]; // Because IE return full URL.
|
|
n = refs[href];
|
|
spans[i].innerHTML =
|
|
"[<a href='#_footnote_" + n +
|
|
"' title='View footnote' class='footnote'>" + n + "</a>]";
|
|
}
|
|
}
|
|
}
|
|
},
|
|
|
|
install: function(toclevels) {
|
|
var timerId;
|
|
|
|
function reinstall() {
|
|
asciidoc.footnotes();
|
|
if (toclevels) {
|
|
asciidoc.toc(toclevels);
|
|
}
|
|
}
|
|
|
|
function reinstallAndRemoveTimer() {
|
|
clearInterval(timerId);
|
|
reinstall();
|
|
}
|
|
|
|
timerId = setInterval(reinstall, 500);
|
|
if (document.addEventListener)
|
|
document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
|
|
else
|
|
window.onload = reinstallAndRemoveTimer;
|
|
}
|
|
|
|
}
|
|
asciidoc.install();
|
|
/*]]>*/
|
|
</script>
|
|
</head>
|
|
<body class="manpage">
|
|
<div id="header">
|
|
<h1>
|
|
git-difftool(1) Manual Page
|
|
</h1>
|
|
<h2>NAME</h2>
|
|
<div class="sectionbody">
|
|
<p>git-difftool -
|
|
Show changes using common diff tools
|
|
</p>
|
|
</div>
|
|
</div>
|
|
<div id="content">
|
|
<div class="sect1">
|
|
<h2 id="_synopsis">SYNOPSIS</h2>
|
|
<div class="sectionbody">
|
|
<div class="verseblock">
|
|
<pre class="content"><em>git difftool</em> [<options>] [<commit> [<commit>]] [--] [<path>…]</pre>
|
|
<div class="attribution">
|
|
</div></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_description">DESCRIPTION</h2>
|
|
<div class="sectionbody">
|
|
<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. See
|
|
<a href="git-diff.html">git-diff(1)</a>.</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_options">OPTIONS</h2>
|
|
<div class="sectionbody">
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
-d
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--dir-diff
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Copy the modified files to a temporary location and perform
|
|
a directory diff on them. This mode never prompts before
|
|
launching the diff tool.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-y
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--no-prompt
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Do not prompt before launching a diff tool.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--prompt
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Prompt before each invocation of the diff tool.
|
|
This is the default behaviour; the option is provided to
|
|
override any configuration settings.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--rotate-to=<file>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Start showing the diff for the given path,
|
|
the paths before it will move to the end and output.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--skip-to=<file>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Start showing the diff for the given path, skipping all
|
|
the paths before it.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-t <tool>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--tool=<tool>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use the diff tool specified by <tool>. Valid values include
|
|
emerge, kompare, meld, and vimdiff. Run <code>git</code> <code>difftool</code> <code>--tool-help</code>
|
|
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 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.</code><em><tool></em><code>.path</code>. For example, you
|
|
can configure the absolute path to kdiff3 by setting
|
|
<code>difftool.kdiff3.path</code>. 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.</code><em><tool></em><code>.cmd</code>.</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)
|
|
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>
|
|
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>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--tool-help
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Print a list of diff tools that may be used with <code>--tool</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--[no-]symlinks
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
<em>git difftool</em>'s default behavior is to create symlinks to the
|
|
working tree when run in <code>--dir-diff</code> 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>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-x <command>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--extcmd=<command>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Specify a custom command for viewing diffs.
|
|
<em>git-difftool</em> ignores the configured defaults and runs
|
|
<em><command></em> <code>$LOCAL</code> <code>$REMOTE</code> when this option is specified.
|
|
Additionally, <code>$BASE</code> is set in the environment.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-g
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
--[no-]gui
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
When <em>git-difftool</em> is invoked with the <code>-g</code> or <code>--gui</code> option
|
|
the default diff tool will be read from the configured
|
|
<code>diff.guitool</code> variable instead of <code>diff.tool</code>. This may be
|
|
selected automatically using the configuration variable
|
|
<code>difftool.guiDefault</code>. The <code>--no-gui</code> option can be used to
|
|
override these settings. If <code>diff.guitool</code> is not set, we will
|
|
fallback in the order of <code>merge.guitool</code>, <code>diff.tool</code>,
|
|
<code>merge.tool</code> until a tool is found.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--[no-]trust-exit-code
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Errors reported by the diff tool are ignored by default.
|
|
Use <code>--trust-exit-code</code> to make <em>git-difftool</em> exit when an
|
|
invoked diff tool returns a non-zero exit code.
|
|
</p>
|
|
<div class="paragraph"><p><em>git-difftool</em> will forward the exit code of the invoked tool when
|
|
<code>--trust-exit-code</code> is used.</p></div>
|
|
</dd>
|
|
</dl></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>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_configuration">CONFIGURATION</h2>
|
|
<div class="sectionbody">
|
|
<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="paragraph"><p>Everything above this line in this section isn’t included from the
|
|
<a href="git-config.html">git-config(1)</a> documentation. The content that follows is the
|
|
same as what’s found there:</p></div>
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
diff.tool
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a>.
|
|
This variable overrides the value configured in <code>merge.tool</code>.
|
|
The list below shows the valid built-in values.
|
|
Any other value is treated as a custom diff tool and requires
|
|
that a corresponding difftool.<tool>.cmd variable is defined.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
diff.guitool
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a> when
|
|
the -g/--gui flag is specified. This variable overrides the value
|
|
configured in <code>merge.guitool</code>. The list below shows the valid
|
|
built-in values. Any other value is treated as a custom diff tool
|
|
and requires that a corresponding difftool.<guitool>.cmd variable
|
|
is defined.
|
|
</p>
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
<code>araxis</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use Araxis Merge (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>bc</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use Beyond Compare (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>bc3</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use Beyond Compare (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>bc4</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use Beyond Compare (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>codecompare</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use Code Compare (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>deltawalker</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use DeltaWalker (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>diffmerge</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use DiffMerge (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>diffuse</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use Diffuse (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>ecmerge</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use ECMerge (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>emerge</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use Emacs' Emerge
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>examdiff</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use ExamDiff Pro (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>guiffy</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use Guiffy’s Diff Tool (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>gvimdiff</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use gVim (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>kdiff3</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use KDiff3 (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>kompare</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use Kompare (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>meld</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use Meld (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>nvimdiff</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use Neovim
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>opendiff</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use FileMerge (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>p4merge</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use HelixCore P4Merge (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>smerge</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use Sublime Merge (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>tkdiff</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use TkDiff (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>vimdiff</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use Vim
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>vscode</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use Visual Studio Code (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>winmerge</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use WinMerge (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>xxdiff</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use xxdiff (requires a graphical session)
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
difftool.<tool>.cmd
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Specify the command to invoke the specified diff tool.
|
|
The specified command is evaluated in shell with the following
|
|
variables available: <em>LOCAL</em> is set to the name of the temporary
|
|
file containing the contents of the diff pre-image and <em>REMOTE</em>
|
|
is set to the name of the temporary file containing the contents
|
|
of the diff post-image.
|
|
</p>
|
|
<div class="paragraph"><p>See the <code>--tool=</code><em><tool></em> option in <a href="git-difftool.html">git-difftool(1)</a> for more details.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
difftool.<tool>.path
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Override the path for the given tool. This is useful in case
|
|
your tool is not in the PATH.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
difftool.trustExitCode
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Exit difftool if the invoked diff tool returns a non-zero exit status.
|
|
</p>
|
|
<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>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
difftool.prompt
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Prompt before each invocation of the diff tool.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
difftool.guiDefault
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Set <code>true</code> to use the <code>diff.guitool</code> by default (equivalent to specifying
|
|
the <code>--gui</code> argument), or <code>auto</code> to select <code>diff.guitool</code> or <code>diff.tool</code>
|
|
depending on the presence of a <code>DISPLAY</code> environment variable value. The
|
|
default is <code>false</code>, where the <code>--gui</code> argument must be provided
|
|
explicitly for the <code>diff.guitool</code> to be used.
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_see_also">SEE ALSO</h2>
|
|
<div class="sectionbody">
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
<a href="git-diff.html">git-diff(1)</a>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show changes between commits, commit and working tree, etc
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<a href="git-mergetool.html">git-mergetool(1)</a>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Run merge conflict resolution tools to resolve merge conflicts
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<a href="git-config.html">git-config(1)</a>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Get and set repository or global options
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_git">GIT</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div id="footnotes"><hr /></div>
|
|
<div id="footer">
|
|
<div id="footer-text">
|
|
Last updated
|
|
2025-08-18 02:18:23 CEST
|
|
</div>
|
|
</div>
|
|
</body>
|
|
</html>
|