4076 lines
121 KiB
HTML
4076 lines
121 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-diff-tree(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-diff-tree(1) Manual Page
|
|
</h1>
|
|
<h2>NAME</h2>
|
|
<div class="sectionbody">
|
|
<p>git-diff-tree -
|
|
Compares the content and mode of blobs found via two tree objects
|
|
</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 diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
|
|
[-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]
|
|
[<common-diff-options>] <tree-ish> [<tree-ish>] [<path>…]</pre>
|
|
<div class="attribution">
|
|
</div></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_description">DESCRIPTION</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>Compare the content and mode of blobs found via two tree objects.</p></div>
|
|
<div class="paragraph"><p>If there is only one <tree-ish> given, the commit is compared with its parents
|
|
(see --stdin below).</p></div>
|
|
<div class="paragraph"><p>Note that <em>git diff-tree</em> can use the tree encapsulated in a commit object.</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_options">OPTIONS</h2>
|
|
<div class="sectionbody">
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
<code>-p</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>-u</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--patch</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Generate patch (see <a href="#generate_patch_text_with_p">[generate_patch_text_with_p]</a>).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-s</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--no-patch</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Suppress all output from the diff machinery. Useful for
|
|
commands like <code>git</code> <code>show</code> that show the patch by default to
|
|
squelch their output, or to cancel the effect of options like
|
|
<code>--patch</code>, <code>--stat</code> earlier on the command line in an alias.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-U</code><em><n></em>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--unified=</code><em><n></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Generate diffs with <em><n></em> lines of context instead of
|
|
the usual three.
|
|
Implies <code>--patch</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--output=</code><em><file></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Output to a specific file instead of stdout.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--output-indicator-new=</code><em><char></em>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--output-indicator-old=</code><em><char></em>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--output-indicator-context=</code><em><char></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Specify the character used to indicate new, old or context
|
|
lines in the generated patch. Normally they are <code>+</code>, <code>-</code> and
|
|
' ' respectively.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--raw</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Generate the diff in raw format.
|
|
This is the default.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--patch-with-raw</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Synonym for <code>-p</code> <code>--raw</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--indent-heuristic</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Enable the heuristic that shifts diff hunk boundaries to make patches
|
|
easier to read. This is the default.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--no-indent-heuristic</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Disable the indent heuristic.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--minimal</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Spend extra time to make sure the smallest possible
|
|
diff is produced.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--patience</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Generate a diff using the "patience diff" algorithm.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--histogram</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Generate a diff using the "histogram diff" algorithm.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--anchored=</code><em><text></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Generate a diff using the "anchored diff" algorithm.
|
|
</p>
|
|
<div class="paragraph"><p>This option may be specified more than once.</p></div>
|
|
<div class="paragraph"><p>If a line exists in both the source and destination, exists only once,
|
|
and starts with <em><text></em>, this algorithm attempts to prevent it from
|
|
appearing as a deletion or addition in the output. It uses the "patience
|
|
diff" algorithm internally.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--diff-algorithm=</code>(<code>patience</code>|<code>minimal</code>|<code>histogram</code>|<code>myers</code>)
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Choose a diff algorithm. The variants are as follows:
|
|
</p>
|
|
<div class="openblock">
|
|
<div class="content">
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
<code>default</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>myers</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
The basic greedy diff algorithm. Currently, this is the default.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>minimal</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Spend extra time to make sure the smallest possible diff is
|
|
produced.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>patience</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use "patience diff" algorithm when generating patches.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>histogram</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
This algorithm extends the patience algorithm to "support
|
|
low-occurrence common elements".
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
</div></div>
|
|
<div class="paragraph"><p>For instance, if you configured the <code>diff.algorithm</code> variable to a
|
|
non-default value and want to use the default one, then you
|
|
have to use <code>--diff-algorithm=default</code> option.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--stat</code>[<code>=</code><em><width></em>[<code>,</code><em><name-width></em>[<code>,</code><em><count></em>]]]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Generate a diffstat. By default, as much space as necessary
|
|
will be used for the filename part, and the rest for the graph
|
|
part. Maximum width defaults to terminal width, or 80 columns
|
|
if not connected to a terminal, and can be overridden by
|
|
<em><width></em>. The width of the filename part can be limited by
|
|
giving another width <em><name-width></em> after a comma or by setting
|
|
<code>diff.statNameWidth=</code><em><name-width></em>. The width of the graph part can be
|
|
limited by using <code>--stat-graph-width=</code><em><graph-width></em> or by setting
|
|
<code>diff.statGraphWidth=</code><em><graph-width></em>. Using <code>--stat</code> or
|
|
<code>--stat-graph-width</code> affects all commands generating a stat graph,
|
|
while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code>
|
|
does not affect <code>git</code> <code>format-patch</code>.
|
|
By giving a third parameter <em><count></em>, you can limit the output to
|
|
the first <em><count></em> lines, followed by ... if there are more.
|
|
</p>
|
|
<div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=</code><em><width></em>,
|
|
<code>--stat-name-width=</code><em><name-width></em> and <code>--stat-count=</code><em><count></em>.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--compact-summary</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Output a condensed summary of extended header information such
|
|
as file creations or deletions ("new" or "gone", optionally <code>+l</code>
|
|
if it’s a symlink) and mode changes (<code>+x</code> or <code>-x</code> for adding
|
|
or removing executable bit respectively) in diffstat. The
|
|
information is put between the filename part and the graph
|
|
part. Implies <code>--stat</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--numstat</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Similar to <code>--stat</code>, but shows number of added and
|
|
deleted lines in decimal notation and pathname without
|
|
abbreviation, to make it more machine friendly. For
|
|
binary files, outputs two <code>-</code> instead of saying
|
|
<code>0</code> <code>0</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--shortstat</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Output only the last line of the <code>--stat</code> format containing total
|
|
number of modified files, as well as number of added and deleted
|
|
lines.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-X</code> [<em><param></em><code>,.</code>..]
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--dirstat</code>[<code>=</code><em><param></em><code>,.</code>..]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Output the distribution of relative amount of changes for each
|
|
sub-directory. The behavior of <code>--dirstat</code> can be customized by
|
|
passing it a comma separated list of parameters.
|
|
The defaults are controlled by the <code>diff.dirstat</code> configuration
|
|
variable (see <a href="git-config.html">git-config(1)</a>).
|
|
The following parameters are available:
|
|
</p>
|
|
<div class="openblock">
|
|
<div class="content">
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
<code>changes</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Compute the dirstat numbers by counting the lines that have been
|
|
removed from the source, or added to the destination. This ignores
|
|
the amount of pure code movements within a file. In other words,
|
|
rearranging lines in a file is not counted as much as other changes.
|
|
This is the default behavior when no parameter is given.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>lines</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Compute the dirstat numbers by doing the regular line-based diff
|
|
analysis, and summing the removed/added line counts. (For binary
|
|
files, count 64-byte chunks instead, since binary files have no
|
|
natural concept of lines). This is a more expensive <code>--dirstat</code>
|
|
behavior than the <code>changes</code> behavior, but it does count rearranged
|
|
lines within a file as much as other changes. The resulting output
|
|
is consistent with what you get from the other <code>--*stat</code> options.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>files</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Compute the dirstat numbers by counting the number of files changed.
|
|
Each changed file counts equally in the dirstat analysis. This is
|
|
the computationally cheapest <code>--dirstat</code> behavior, since it does
|
|
not have to look at the file contents at all.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>cumulative</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Count changes in a child directory for the parent directory as well.
|
|
Note that when using <code>cumulative</code>, the sum of the percentages
|
|
reported may exceed 100%. The default (non-cumulative) behavior can
|
|
be specified with the <code>noncumulative</code> parameter.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<em><limit></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
An integer parameter specifies a cut-off percent (3% by default).
|
|
Directories contributing less than this percentage of the changes
|
|
are not shown in the output.
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
</div></div>
|
|
<div class="paragraph"><p>Example: The following will count changed files, while ignoring
|
|
directories with less than 10% of the total amount of changed files,
|
|
and accumulating child directory counts in the parent directories:
|
|
<code>--dirstat=files,10,cumulative</code>.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--cumulative</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Synonym for <code>--dirstat=cumulative</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--dirstat-by-file</code>[<code>=</code><em><param></em><code>,.</code>..]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Synonym for <code>--dirstat=files,</code><em><param></em><code>,.</code>...
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--summary</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Output a condensed summary of extended header information
|
|
such as creations, renames and mode changes.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--patch-with-stat</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Synonym for <code>-p</code> <code>--stat</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-z</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
When <code>--raw</code>, <code>--numstat</code>, <code>--name-only</code> or <code>--name-status</code> has been
|
|
given, do not munge pathnames and use NULs as output field terminators.
|
|
</p>
|
|
<div class="paragraph"><p>Without this option, pathnames with "unusual" characters are quoted as
|
|
explained for the configuration variable <code>core.quotePath</code> (see
|
|
<a href="git-config.html">git-config(1)</a>).</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--name-only</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show only the name of each changed file in the post-image tree.
|
|
The file names are often encoded in UTF-8.
|
|
For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
|
|
manual page.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--name-status</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show only the name(s) and status of each changed file. See the description
|
|
of the <code>--diff-filter</code> option on what the status letters mean.
|
|
Just like <code>--name-only</code> the file names are often encoded in UTF-8.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--submodule</code>[<code>=</code><em><format></em>]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Specify how differences in submodules are shown. When specifying
|
|
<code>--submodule=short</code> the <code>short</code> format is used. This format just
|
|
shows the names of the commits at the beginning and end of the range.
|
|
When <code>--submodule</code> or <code>--submodule=log</code> is specified, the <code>log</code>
|
|
format is used. This format lists the commits in the range like
|
|
<a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code>
|
|
is specified, the <code>diff</code> format is used. This format shows an
|
|
inline diff of the changes in the submodule contents between the
|
|
commit range. Defaults to <code>diff.submodule</code> or the <code>short</code> format
|
|
if the config option is unset.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--color</code>[<code>=</code><em><when></em>]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show colored diff.
|
|
<code>--color</code> (i.e. without <code>=</code><em><when></em>) is the same as <code>--color=always</code>.
|
|
<em><when></em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--no-color</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Turn off colored diff.
|
|
It is the same as <code>--color=never</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--color-moved</code>[<code>=</code><em><mode></em>]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Moved lines of code are colored differently.
|
|
The <em><mode></em> defaults to <code>no</code> if the option is not given
|
|
and to <code>zebra</code> if the option with no mode is given.
|
|
The mode must be one of:
|
|
</p>
|
|
<div class="openblock">
|
|
<div class="content">
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
<code>no</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Moved lines are not highlighted.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>default</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Is a synonym for <code>zebra</code>. This may change to a more sensible mode
|
|
in the future.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>plain</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Any line that is added in one location and was removed
|
|
in another location will be colored with <code>color.diff.newMoved</code>.
|
|
Similarly <code>color.diff.oldMoved</code> will be used for removed lines
|
|
that are added somewhere else in the diff. This mode picks up any
|
|
moved line, but it is not very useful in a review to determine
|
|
if a block of code was moved without permutation.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>blocks</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Blocks of moved text of at least 20 alphanumeric characters
|
|
are detected greedily. The detected blocks are
|
|
painted using either the <code>color.diff.</code>(<code>old</code>|<code>new</code>)<code>Moved</code> color.
|
|
Adjacent blocks cannot be told apart.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>zebra</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Blocks of moved text are detected as in <code>blocks</code> mode. The blocks
|
|
are painted using either the <code>color.diff.</code>(<code>old</code>|<code>new</code>)<code>Moved</code> color or
|
|
<code>color.diff.</code>(<code>old</code>|<code>new</code>)<code>MovedAlternative</code>. The change between
|
|
the two colors indicates that a new block was detected.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>dimmed-zebra</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Similar to <code>zebra</code>, but additional dimming of uninteresting parts
|
|
of moved code is performed. The bordering lines of two adjacent
|
|
blocks are considered interesting, the rest is uninteresting.
|
|
<code>dimmed_zebra</code> is a deprecated synonym.
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
</div></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--no-color-moved</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Turn off move detection. This can be used to override configuration
|
|
settings. It is the same as <code>--color-moved=no</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--color-moved-ws=</code><em><mode></em><code>,.</code>..
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
This configures how whitespace is ignored when performing the
|
|
move detection for <code>--color-moved</code>.
|
|
These modes can be given as a comma separated list:
|
|
</p>
|
|
<div class="openblock">
|
|
<div class="content">
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
<code>no</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Do not ignore whitespace when performing move detection.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>ignore-space-at-eol</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Ignore changes in whitespace at EOL.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>ignore-space-change</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Ignore changes in amount of whitespace. This ignores whitespace
|
|
at line end, and considers all other sequences of one or
|
|
more whitespace characters to be equivalent.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>ignore-all-space</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Ignore whitespace when comparing lines. This ignores differences
|
|
even if one line has whitespace where the other line has none.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>allow-indentation-change</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Initially ignore any whitespace in the move detection, then
|
|
group the moved code blocks only into a block if the change in
|
|
whitespace is the same per line. This is incompatible with the
|
|
other modes.
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
</div></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--no-color-moved-ws</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Do not ignore whitespace when performing move detection. This can be
|
|
used to override configuration settings. It is the same as
|
|
<code>--color-moved-ws=no</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--word-diff</code>[<code>=</code><em><mode></em>]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
By default, words are delimited by whitespace; see
|
|
<code>--word-diff-regex</code> below. The <em><mode></em> defaults to <code>plain</code>, and
|
|
must be one of:
|
|
</p>
|
|
<div class="openblock">
|
|
<div class="content">
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
<code>color</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Highlight changed words using only colors. Implies <code>--color</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>plain</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show words as <code>[-removed-]</code> and <code>{<code>added</code>}</code>. Makes no
|
|
attempts to escape the delimiters if they appear in the input,
|
|
so the output may be ambiguous.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>porcelain</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use a special line-based format intended for script
|
|
consumption. Added/removed/unchanged runs are printed in the
|
|
usual unified diff format, starting with a <code>+</code>/<code>-</code>/` `
|
|
character at the beginning of the line and extending to the
|
|
end of the line. Newlines in the input are represented by a
|
|
tilde <code>~</code> on a line of its own.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>none</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Disable word diff again.
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
</div></div>
|
|
<div class="paragraph"><p>Note that despite the name of the first mode, color is used to
|
|
highlight the changed parts in all modes if enabled.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--word-diff-regex=</code><em><regex></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use <em><regex></em> to decide what a word is, instead of considering
|
|
runs of non-whitespace to be a word. Also implies
|
|
<code>--word-diff</code> unless it was already enabled.
|
|
</p>
|
|
<div class="paragraph"><p>Every non-overlapping match of the
|
|
<em><regex></em> is considered a word. Anything between these matches is
|
|
considered whitespace and ignored(!) for the purposes of finding
|
|
differences. You may want to append |[<code>^</code>[<code>:space:</code>]] to your regular
|
|
expression to make sure that it matches all non-whitespace characters.
|
|
A match that contains a newline is silently truncated(!) at the
|
|
newline.</p></div>
|
|
<div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
|
|
and, correspondingly, show differences character by character.</p></div>
|
|
<div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
|
|
<a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
|
|
overrides any diff driver or configuration setting. Diff drivers
|
|
override configuration settings.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--color-words</code>[<code>=</code><em><regex></em>]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Equivalent to <code>--word-diff=color</code> plus (if a regex was
|
|
specified) <code>--word-diff-regex=</code><em><regex></em>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--no-renames</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Turn off rename detection, even when the configuration
|
|
file gives the default to do so.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--</code>[<code>no-</code>]<code>rename-empty</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Whether to use empty blobs as rename source.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--check</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Warn if changes introduce conflict markers or whitespace errors.
|
|
What are considered whitespace errors is controlled by <code>core.whitespace</code>
|
|
configuration. By default, trailing whitespaces (including
|
|
lines that consist solely of whitespaces) and a space character
|
|
that is immediately followed by a tab character inside the
|
|
initial indent of the line are considered whitespace errors.
|
|
Exits with non-zero status if problems are found. Not compatible
|
|
with <code>--exit-code</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--ws-error-highlight=</code><em><kind></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Highlight whitespace errors in the <code>context</code>, <code>old</code> or <code>new</code>
|
|
lines of the diff. Multiple values are separated by comma,
|
|
<code>none</code> resets previous values, <code>default</code> reset the list to
|
|
<code>new</code> and <code>all</code> is a shorthand for <code>old,new,context</code>. When
|
|
this option is not given, and the configuration variable
|
|
<code>diff.wsErrorHighlight</code> is not set, only whitespace errors in
|
|
<code>new</code> lines are highlighted. The whitespace errors are colored
|
|
with <code>color.diff.whitespace</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--full-index</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Instead of the first handful of characters, show the full
|
|
pre- and post-image blob object names on the "index"
|
|
line when generating patch format output.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--binary</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
In addition to <code>--full-index</code>, output a binary diff that
|
|
can be applied with <code>git-apply</code>.
|
|
Implies <code>--patch</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--abbrev</code>[<code>=</code><em><n></em>]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Instead of showing the full 40-byte hexadecimal object
|
|
name in diff-raw format output and diff-tree header
|
|
lines, show the shortest prefix that is at least <em><n></em>
|
|
hexdigits long that uniquely refers the object.
|
|
In diff-patch output format, <code>--full-index</code> takes higher
|
|
precedence, i.e. if <code>--full-index</code> is specified, full blob
|
|
names will be shown regardless of <code>--abbrev</code>.
|
|
Non default number of digits can be specified with <code>--abbrev=</code><em><n></em>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-B</code>[<em><n></em>][<code>/</code><em><m></em>]
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--break-rewrites</code>[<code>=</code>[<em><n></em>][<code>/</code><em><m></em>]]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Break complete rewrite changes into pairs of delete and
|
|
create. This serves two purposes:
|
|
</p>
|
|
<div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
|
|
not as a series of deletion and insertion mixed together with a very
|
|
few lines that happen to match textually as the context, but as a
|
|
single deletion of everything old followed by a single insertion of
|
|
everything new, and the number <em><m></em> controls this aspect of the <code>-B</code>
|
|
option (defaults to 60%). <code>-B/70</code>% specifies that less than 30% of the
|
|
original should remain in the result for Git to consider it a total
|
|
rewrite (i.e. otherwise the resulting patch will be a series of
|
|
deletion and insertion mixed together with context lines).</p></div>
|
|
<div class="paragraph"><p>When used with <code>-M</code>, a totally-rewritten file is also considered as the
|
|
source of a rename (usually <code>-M</code> only considers a file that disappeared
|
|
as the source of a rename), and the number <em><n></em> controls this aspect of
|
|
the <code>-B</code> option (defaults to 50%). <code>-B20</code>% specifies that a change with
|
|
addition and deletion compared to 20% or more of the file’s size are
|
|
eligible for being picked up as a possible source of a rename to
|
|
another file.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-M</code>[<em><n></em>]
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--find-renames</code>[<code>=</code><em><n></em>]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Detect renames.
|
|
If <em><n></em> is specified, it is a threshold on the similarity
|
|
index (i.e. amount of addition/deletions compared to the
|
|
file’s size). For example, <code>-M90</code>% means Git should consider a
|
|
delete/add pair to be a rename if more than 90% of the file
|
|
hasn’t changed. Without a % sign, the number is to be read as
|
|
a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
|
|
0.5, and is thus the same as <code>-M50</code>%. Similarly, <code>-M05</code> is
|
|
the same as <code>-M5</code>%. To limit detection to exact renames, use
|
|
<code>-M100</code>%. The default similarity index is 50%.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-C</code>[<em><n></em>]
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--find-copies</code>[<code>=</code><em><n></em>]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Detect copies as well as renames. See also <code>--find-copies-harder</code>.
|
|
If <em><n></em> is specified, it has the same meaning as for <code>-M</code><em><n></em>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--find-copies-harder</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
For performance reasons, by default, <code>-C</code> option finds copies only
|
|
if the original file of the copy was modified in the same
|
|
changeset. This flag makes the command
|
|
inspect unmodified files as candidates for the source of
|
|
copy. This is a very expensive operation for large
|
|
projects, so use it with caution. Giving more than one
|
|
<code>-C</code> option has the same effect.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-D</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--irreversible-delete</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Omit the preimage for deletes, i.e. print only the header but not
|
|
the diff between the preimage and <code>/dev/null</code>. The resulting patch
|
|
is not meant to be applied with <code>patch</code> or <code>git</code> <code>apply</code>; this is
|
|
solely for people who want to just concentrate on reviewing the
|
|
text after the change. In addition, the output obviously lacks
|
|
enough information to apply such a patch in reverse, even manually,
|
|
hence the name of the option.
|
|
</p>
|
|
<div class="paragraph"><p>When used together with <code>-B</code>, omit also the preimage in the deletion part
|
|
of a delete/create pair.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-l</code><em><num></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
The <code>-M</code> and <code>-C</code> options involve some preliminary steps that
|
|
can detect subsets of renames/copies cheaply, followed by an
|
|
exhaustive fallback portion that compares all remaining
|
|
unpaired destinations to all relevant sources. (For renames,
|
|
only remaining unpaired sources are relevant; for copies, all
|
|
original sources are relevant.) For N sources and
|
|
destinations, this exhaustive check is O(N^2). This option
|
|
prevents the exhaustive portion of rename/copy detection from
|
|
running if the number of source/destination files involved
|
|
exceeds the specified number. Defaults to <code>diff.renameLimit</code>.
|
|
Note that a value of 0 is treated as unlimited.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[<code>*</code>]]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Select only files that are Added (<code>A</code>), Copied (<code>C</code>),
|
|
Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their
|
|
type (i.e. regular file, symlink, submodule, …) changed (<code>T</code>),
|
|
are Unmerged (<code>U</code>), are
|
|
Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>).
|
|
Any combination of the filter characters (including none) can be used.
|
|
When <code>*</code> (All-or-none) is added to the combination, all
|
|
paths are selected if there is any file that matches
|
|
other criteria in the comparison; if there is no file
|
|
that matches other criteria, nothing is selected.
|
|
</p>
|
|
<div class="paragraph"><p>Also, these upper-case letters can be downcased to exclude. E.g.
|
|
<code>--diff-filter=ad</code> excludes added and deleted paths.</p></div>
|
|
<div class="paragraph"><p>Note that not all diffs can feature all types. For instance, copied and
|
|
renamed entries cannot appear if detection for those types is disabled.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-S</code><em><string></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Look for differences that change the number of occurrences of
|
|
the specified <em><string></em> (i.e. addition/deletion) in a file.
|
|
Intended for the scripter’s use.
|
|
</p>
|
|
<div class="paragraph"><p>It is useful when you’re looking for an exact block of code (like a
|
|
struct), and want to know the history of that block since it first
|
|
came into being: use the feature iteratively to feed the interesting
|
|
block in the preimage back into <code>-S</code>, and keep going until you get the
|
|
very first version of the block.</p></div>
|
|
<div class="paragraph"><p>Binary files are searched as well.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-G</code><em><regex></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Look for differences whose patch text contains added/removed
|
|
lines that match <em><regex></em>.
|
|
</p>
|
|
<div class="paragraph"><p>To illustrate the difference between <code>-S</code><em><regex></em> <code>--pickaxe-regex</code> and
|
|
<code>-G</code><em><regex></em>, consider a commit with the following diff in the same
|
|
file:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>+ return frotz(nitfol, two->ptr, 1, 0);
|
|
...
|
|
- hit = frotz(nitfol, mf2.ptr, 1, 0);</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>While <code>git</code> <code>log</code> <code>-G</code>"frotz\(<code>nitfol</code>" will show this commit, <code>git</code> <code>log</code>
|
|
<code>-S</code>"frotz\(<code>nitfol</code>" <code>--pickaxe-regex</code> will not (because the number of
|
|
occurrences of that string did not change).</p></div>
|
|
<div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
|
|
filter will be ignored.</p></div>
|
|
<div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
|
|
information.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--find-object=</code><em><object-id></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Look for differences that change the number of occurrences of
|
|
the specified object. Similar to <code>-S</code>, just the argument is different
|
|
in that it doesn’t search for a specific string but for a specific
|
|
object id.
|
|
</p>
|
|
<div class="paragraph"><p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
|
|
<code>git-log</code> to also find trees.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--pickaxe-all</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
When <code>-S</code> or <code>-G</code> finds a change, show all the changes in that
|
|
changeset, not just the files that contain the change
|
|
in <em><string></em>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--pickaxe-regex</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Treat the <em><string></em> given to <code>-S</code> as an extended POSIX regular
|
|
expression to match.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-O</code><em><orderfile></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Control the order in which files appear in the output.
|
|
This overrides the <code>diff.orderFile</code> configuration variable
|
|
(see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderFile</code>,
|
|
use <code>-O/dev/null</code>.
|
|
</p>
|
|
<div class="paragraph"><p>The output order is determined by the order of glob patterns in
|
|
<em><orderfile></em>.
|
|
All files with pathnames that match the first pattern are output
|
|
first, all files with pathnames that match the second pattern (but not
|
|
the first) are output next, and so on.
|
|
All files with pathnames that do not match any pattern are output
|
|
last, as if there was an implicit match-all pattern at the end of the
|
|
file.
|
|
If multiple pathnames have the same rank (they match the same pattern
|
|
but no earlier patterns), their output order relative to each other is
|
|
the normal order.</p></div>
|
|
<div class="paragraph"><p><em><orderfile></em> is parsed as follows:</p></div>
|
|
<div class="openblock">
|
|
<div class="content">
|
|
<div class="ulist"><ul>
|
|
<li>
|
|
<p>
|
|
Blank lines are ignored, so they can be used as separators for
|
|
readability.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
Lines starting with a hash ("#") are ignored, so they can be used
|
|
for comments. Add a backslash ("<code>\</code>") to the beginning of the
|
|
pattern if it starts with a hash.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
Each other line contains a single pattern.
|
|
</p>
|
|
</li>
|
|
</ul></div>
|
|
</div></div>
|
|
<div class="paragraph"><p>Patterns have the same syntax and semantics as patterns used for
|
|
<code>fnmatch</code>(3) without the <code>FNM_PATHNAME</code> flag, except a pathname also
|
|
matches a pattern if removing any number of the final pathname
|
|
components matches the pattern. For example, the pattern "<code>foo*bar</code>"
|
|
matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--skip-to=</code><em><file></em>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--rotate-to=</code><em><file></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Discard the files before the named <em><file></em> from the output
|
|
(i.e. <em>skip to</em>), or move them to the end of the output
|
|
(i.e. <em>rotate to</em>). These options were invented primarily for the use
|
|
of the <code>git</code> <code>difftool</code> command, and may not be very useful
|
|
otherwise.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-R</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Swap two inputs; that is, show differences from index or
|
|
on-disk file to tree contents.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--relative</code>[<code>=</code><em><path></em>]
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--no-relative</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
When run from a subdirectory of the project, it can be
|
|
told to exclude changes outside the directory and show
|
|
pathnames relative to it with this option. When you are
|
|
not in a subdirectory (e.g. in a bare repository), you
|
|
can name which subdirectory to make the output relative
|
|
to by giving a <em><path></em> as an argument.
|
|
<code>--no-relative</code> can be used to countermand both <code>diff.relative</code> config
|
|
option and previous <code>--relative</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-a</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--text</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Treat all files as text.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--ignore-cr-at-eol</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Ignore carriage-return at the end of line when doing a comparison.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--ignore-space-at-eol</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Ignore changes in whitespace at EOL.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-b</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--ignore-space-change</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Ignore changes in amount of whitespace. This ignores whitespace
|
|
at line end, and considers all other sequences of one or
|
|
more whitespace characters to be equivalent.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-w</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--ignore-all-space</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Ignore whitespace when comparing lines. This ignores
|
|
differences even if one line has whitespace where the other
|
|
line has none.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--ignore-blank-lines</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Ignore changes whose lines are all blank.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-I</code><em><regex></em>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--ignore-matching-lines=</code><em><regex></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Ignore changes whose all lines match <em><regex></em>. This option may
|
|
be specified more than once.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--inter-hunk-context=</code><em><number></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show the context between diff hunks, up to the specified <em><number></em>
|
|
of lines, thereby fusing hunks that are close to each other.
|
|
Defaults to <code>diff.interHunkContext</code> or 0 if the config option
|
|
is unset.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>-W</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--function-context</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show whole function as context lines for each change.
|
|
The function names are determined in the same way as
|
|
<code>git</code> <code>diff</code> works out patch hunk headers (see "Defining a
|
|
custom hunk-header" in <a href="gitattributes.html">gitattributes(5)</a>).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--exit-code</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Make the program exit with codes similar to <code>diff</code>(1).
|
|
That is, it exits with 1 if there were differences and
|
|
0 means no differences.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--quiet</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Disable all output of the program. Implies <code>--exit-code</code>.
|
|
Disables execution of external diff helpers whose exit code
|
|
is not trusted, i.e. their respective configuration option
|
|
<code>diff.trustExitCode</code> or <code>diff.</code><em><driver></em><code>.trustExitCode</code> or
|
|
environment variable <code>GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE</code> is
|
|
false.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--ext-diff</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Allow an external diff helper to be executed. If you set an
|
|
external diff driver with <a href="gitattributes.html">gitattributes(5)</a>, you need
|
|
to use this option with <a href="git-log.html">git-log(1)</a> and friends.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--no-ext-diff</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Disallow external diff drivers.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--textconv</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--no-textconv</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Allow (or disallow) external text conversion filters to be run
|
|
when comparing binary files. See <a href="gitattributes.html">gitattributes(5)</a> for
|
|
details. Because textconv filters are typically a one-way
|
|
conversion, the resulting diff is suitable for human
|
|
consumption, but cannot be applied. For this reason, textconv
|
|
filters are enabled by default only for <a href="git-diff.html">git-diff(1)</a> and
|
|
<a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
|
|
diff plumbing commands.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--ignore-submodules</code>[<code>=</code>(<code>none</code>|<code>untracked</code>|<code>dirty</code>|<code>all</code>)]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Ignore changes to submodules in the diff generation. <code>all</code> is the default.
|
|
Using <code>none</code> will consider the submodule modified when it either contains
|
|
untracked or modified files or its <code>HEAD</code> differs from the commit recorded
|
|
in the superproject and can be used to override any settings of the
|
|
<code>ignore</code> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
|
|
<code>untracked</code> is used submodules are not considered dirty when they only
|
|
contain untracked content (but they are still scanned for modified
|
|
content). Using <code>dirty</code> ignores all changes to the work tree of submodules,
|
|
only changes to the commits stored in the superproject are shown (this was
|
|
the behavior until 1.7.0). Using <code>all</code> hides all changes to submodules.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--src-prefix=</code><em><prefix></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show the given source <em><prefix></em> instead of "a/".
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--dst-prefix=</code><em><prefix></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show the given destination <em><prefix></em> instead of "b/".
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--no-prefix</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Do not show any source or destination prefix.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--default-prefix</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Use the default source and destination prefixes ("a/" and "b/").
|
|
This overrides configuration variables such as <code>diff.noprefix</code>,
|
|
<code>diff.srcPrefix</code>, <code>diff.dstPrefix</code>, and <code>diff.mnemonicPrefix</code>
|
|
(see <a href="git-config.html">git-config(1)</a>).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--line-prefix=</code><em><prefix></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Prepend an additional <em><prefix></em> to every line of output.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--ita-invisible-in-index</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
By default entries added by <code>git</code> <code>add</code> <code>-N</code> appear as an existing
|
|
empty file in <code>git</code> <code>diff</code> and a new file in <code>git</code> <code>diff</code> <code>--cached</code>.
|
|
This option makes the entry appear as a new file in <code>git</code> <code>diff</code>
|
|
and non-existent in <code>git</code> <code>diff</code> <code>--cached</code>. This option could be
|
|
reverted with <code>--ita-visible-in-index</code>. Both options are
|
|
experimental and could be removed in future.
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
<div class="paragraph"><p>For more detailed explanation on these common options, see also
|
|
<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
<tree-ish>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
The id of a tree object.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<path>…
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
If provided, the results are limited to a subset of files
|
|
matching one of the provided pathspecs.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-r
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Recurse into sub-trees.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-t
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show tree entry itself as well as subtrees. Implies -r.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--root
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
When <code>--root</code> is specified the initial commit will be shown as a big
|
|
creation event. This is equivalent to a diff against the NULL tree.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--merge-base
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Instead of comparing the <tree-ish>s directly, use the merge
|
|
base between the two <tree-ish>s as the "before" side. There
|
|
must be two <tree-ish>s given and they must both be commits.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--stdin
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
When <code>--stdin</code> is specified, the command does not take
|
|
<tree-ish> arguments from the command line. Instead, it
|
|
reads lines containing either two <tree>, one <commit>, or a
|
|
list of <commit> from its standard input. (Use a single space
|
|
as separator.)
|
|
</p>
|
|
<div class="paragraph"><p>When two trees are given, it compares the first tree with the second.
|
|
When a single commit is given, it compares the commit with its
|
|
parents. The remaining commits, when given, are used as if they are
|
|
parents of the first commit.</p></div>
|
|
<div class="paragraph"><p>When comparing two trees, the ID of both trees (separated by a space
|
|
and terminated by a newline) is printed before the difference. When
|
|
comparing commits, the ID of the first (or only) commit, followed by a
|
|
newline, is printed.</p></div>
|
|
<div class="paragraph"><p>The following flags further affect the behavior when comparing
|
|
commits (but not trees).</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-m
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
By default, <em>git diff-tree --stdin</em> does not show
|
|
differences for merge commits. With this flag, it shows
|
|
differences to that commit from all of its parents. See
|
|
also <code>-c</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-s
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
By default, <em>git diff-tree --stdin</em> shows differences,
|
|
either in machine-readable form (without <code>-p</code>) or in patch
|
|
form (with <code>-p</code>). This output can be suppressed. It is
|
|
only useful with the <code>-v</code> flag.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-v
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
This flag causes <em>git diff-tree --stdin</em> to also show
|
|
the commit message before the differences.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--pretty</code>[<code>=</code><em><format></em>]
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--format=</code><em><format></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Pretty-print the contents of the commit logs in a given format,
|
|
where <em><format></em> can be one of <code>oneline</code>, <code>short</code>, <code>medium</code>,
|
|
<code>full</code>, <code>fuller</code>, <code>reference</code>, <code>email</code>, <code>raw</code>, <code>format:</code><em><string></em>
|
|
and <code>tformat:</code><em><string></em>. When <em><format></em> is none of the above,
|
|
and has %<em><placeholder></em> in it, it acts as if
|
|
<code>--pretty=tformat:</code><em><format></em> were given.
|
|
</p>
|
|
<div class="paragraph"><p>See the "PRETTY FORMATS" section for some additional details for each
|
|
format. When <code>=</code><em><format></em> part is omitted, it defaults to <code>medium</code>.</p></div>
|
|
<div class="admonitionblock">
|
|
<table><tr>
|
|
<td class="icon">
|
|
<div class="title">Note</div>
|
|
</td>
|
|
<td class="content">you can specify the default pretty format in the repository
|
|
configuration (see <a href="git-config.html">git-config(1)</a>).</td>
|
|
</tr></table>
|
|
</div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--abbrev-commit</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Instead of showing the full 40-byte hexadecimal commit object
|
|
name, show a prefix that names the object uniquely.
|
|
<code>--abbrev=</code><em><n></em> (which also modifies diff output, if it is displayed)
|
|
option can be used to specify the minimum length of the prefix.
|
|
</p>
|
|
<div class="paragraph"><p>This should make <code>--pretty=oneline</code> a whole lot more readable for
|
|
people using 80-column terminals.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--no-abbrev-commit</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show the full 40-byte hexadecimal commit object name. This negates
|
|
<code>--abbrev-commit</code>, either explicit or implied by other options such
|
|
as <code>--oneline</code>. It also overrides the <code>log.abbrevCommit</code> variable.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--oneline</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
This is a shorthand for <code>--pretty=oneline</code> <code>--abbrev-commit</code>
|
|
used together.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--encoding=</code><em><encoding></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Commit objects record the character encoding used for the log message
|
|
in their encoding header; this option can be used to tell the
|
|
command to re-code the commit log message in the encoding
|
|
preferred by the user. For non plumbing commands this
|
|
defaults to UTF-8. Note that if an object claims to be encoded
|
|
in <code>X</code> and we are outputting in <code>X</code>, we will output the object
|
|
verbatim; this means that invalid sequences in the original
|
|
commit may be copied to the output. Likewise, if iconv(3) fails
|
|
to convert the commit, we will quietly output the original
|
|
object verbatim.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--expand-tabs=</code><em><n></em>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--expand-tabs</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--no-expand-tabs</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Perform a tab expansion (replace each tab with enough spaces
|
|
to fill to the next display column that is a multiple of <em><n></em>)
|
|
in the log message before showing it in the output.
|
|
<code>--expand-tabs</code> is a short-hand for <code>--expand-tabs=8</code>, and
|
|
<code>--no-expand-tabs</code> is a short-hand for <code>--expand-tabs=0</code>,
|
|
which disables tab expansion.
|
|
</p>
|
|
<div class="paragraph"><p>By default, tabs are expanded in pretty formats that indent the log
|
|
message by 4 spaces (i.e. <code>medium</code>, which is the default, <code>full</code>,
|
|
and <code>fuller</code>).</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--notes</code>[<code>=</code><em><ref></em>]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the
|
|
commit, when showing the commit log message. This is the default
|
|
for <code>git</code> <code>log</code>, <code>git</code> <code>show</code> and <code>git</code> <code>whatchanged</code> commands when
|
|
there is no <code>--pretty</code>, <code>--format</code>, or <code>--oneline</code> option given
|
|
on the command line.
|
|
</p>
|
|
<div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the
|
|
<code>core.notesRef</code> and <code>notes.displayRef</code> variables (or corresponding
|
|
environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
|
|
<div class="paragraph"><p>With an optional <em><ref></em> argument, use the ref to find the notes
|
|
to display. The ref can specify the full refname when it begins
|
|
with <code>refs/notes/</code>; when it begins with <code>notes/</code>, <code>refs/</code> and otherwise
|
|
<code>refs/notes/</code> is prefixed to form the full name of the ref.</p></div>
|
|
<div class="paragraph"><p>Multiple <code>--notes</code> options can be combined to control which notes are
|
|
being displayed. Examples: "<code>--notes=foo</code>" will show only notes from
|
|
<code>refs/notes/foo</code>; "<code>--notes=foo</code> <code>--notes</code>" will show both notes from
|
|
"refs/notes/foo" and from the default notes ref(s).</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--no-notes</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Do not show notes. This negates the above <code>--notes</code> option, by
|
|
resetting the list of notes refs from which notes are shown.
|
|
Options are parsed in the order given on the command line, so e.g.
|
|
"<code>--notes</code> <code>--notes=foo</code> <code>--no-notes</code> <code>--notes=bar</code>" will only show notes
|
|
from <code>refs/notes/bar</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--show-notes-by-default</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show the default notes unless options for displaying specific
|
|
notes are given.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--show-notes</code>[<code>=</code><em><ref></em>]
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--standard-notes</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>--no-standard-notes</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
These options are deprecated. Use the above <code>--notes</code>/<code>--no-notes</code>
|
|
options instead.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>--show-signature</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Check the validity of a signed commit object by passing the signature
|
|
to <code>gpg</code> <code>--verify</code> and show the output.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--no-commit-id
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
<em>git diff-tree</em> outputs a line with the commit ID when
|
|
applicable. This flag suppresses the commit ID output.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
-c
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
This flag changes the way a merge commit is displayed
|
|
(which means it is useful only when the command is given
|
|
one <tree-ish>, or <code>--stdin</code>). It shows the differences
|
|
from each of the parents to the merge result simultaneously
|
|
instead of showing pairwise diff between a parent and the
|
|
result one at a time (which is what the <code>-m</code> option does).
|
|
Furthermore, it lists only files which were modified
|
|
from all parents.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--cc
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
This flag changes the way a merge commit patch is displayed,
|
|
in a similar way to the <code>-c</code> option. It implies the <code>-c</code>
|
|
and <code>-p</code> options and further compresses the patch output
|
|
by omitting uninteresting hunks whose contents in the parents
|
|
have only two variants and the merge result picks one of them
|
|
without modification. When all hunks are uninteresting, the commit
|
|
itself and the commit log message are not shown, just like in any other
|
|
"empty diff" case.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--combined-all-paths
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
This flag causes combined diffs (used for merge commits) to
|
|
list the name of the file from all parents. It thus only has
|
|
effect when -c or --cc are specified, and is likely only
|
|
useful if filename changes are detected (i.e. when either
|
|
rename or copy detection have been requested).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--always
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Show the commit itself and the commit log message even
|
|
if the diff itself is empty.
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_pretty_formats">PRETTY FORMATS</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>If the commit is a merge, and if the pretty-format
|
|
is not <code>oneline</code>, <code>email</code> or <code>raw</code>, an additional line is
|
|
inserted before the <code>Author:</code> line. This line begins with
|
|
"Merge: " and the hashes of ancestral commits are printed,
|
|
separated by spaces. Note that the listed commits may not
|
|
necessarily be the list of the <em>direct</em> parent commits if you
|
|
have limited your view of history: for example, if you are
|
|
only interested in changes related to a certain directory or
|
|
file.</p></div>
|
|
<div class="paragraph"><p>There are several built-in formats, and you can define
|
|
additional formats by setting a pretty.<name>
|
|
config option to either another format name, or a
|
|
<code>format:</code> string, as described below (see
|
|
<a href="git-config.html">git-config(1)</a>). Here are the details of the
|
|
built-in formats:</p></div>
|
|
<div class="ulist"><ul>
|
|
<li>
|
|
<p>
|
|
<code>oneline</code>
|
|
</p>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code><hash> <title-line></code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>This is designed to be as compact as possible.</p></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>short</code>
|
|
</p>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code>commit <hash>
|
|
Author: <author></code></pre>
|
|
</div></div>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code><title-line></code></pre>
|
|
</div></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>medium</code>
|
|
</p>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code>commit <hash>
|
|
Author: <author>
|
|
Date: <author-date></code></pre>
|
|
</div></div>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code><title-line></code></pre>
|
|
</div></div>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code><full-commit-message></code></pre>
|
|
</div></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>full</code>
|
|
</p>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code>commit <hash>
|
|
Author: <author>
|
|
Commit: <committer></code></pre>
|
|
</div></div>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code><title-line></code></pre>
|
|
</div></div>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code><full-commit-message></code></pre>
|
|
</div></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>fuller</code>
|
|
</p>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code>commit <hash>
|
|
Author: <author>
|
|
AuthorDate: <author-date>
|
|
Commit: <committer>
|
|
CommitDate: <committer-date></code></pre>
|
|
</div></div>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code><title-line></code></pre>
|
|
</div></div>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code><full-commit-message></code></pre>
|
|
</div></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>reference</code>
|
|
</p>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code><abbrev-hash> (<title-line>, <short-author-date>)</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>This format is used to refer to another commit in a commit message and
|
|
is the same as <code>--pretty='format:%C(auto)%h (%s, %ad)'</code>. By default,
|
|
the date is formatted with <code>--date=short</code> unless another <code>--date</code> option
|
|
is explicitly specified. As with any <code>format:</code> with format
|
|
placeholders, its output is not affected by other options like
|
|
<code>--decorate</code> and <code>--walk-reflogs</code>.</p></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>email</code>
|
|
</p>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code>From <hash> <date>
|
|
From: <author>
|
|
Date: <author-date>
|
|
Subject: [PATCH] <title-line></code></pre>
|
|
</div></div>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code><full-commit-message></code></pre>
|
|
</div></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>mboxrd</code>
|
|
</p>
|
|
<div class="paragraph"><p>Like <code>email</code>, but lines in the commit message starting with "From "
|
|
(preceded by zero or more ">") are quoted with ">" so they aren’t
|
|
confused as starting a new commit.</p></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>raw</code>
|
|
</p>
|
|
<div class="paragraph"><p>The <code>raw</code> format shows the entire commit exactly as
|
|
stored in the commit object. Notably, the hashes are
|
|
displayed in full, regardless of whether <code>--abbrev</code> or
|
|
<code>--no-abbrev</code> are used, and <em>parents</em> information show the
|
|
true parent commits, without taking grafts or history
|
|
simplification into account. Note that this format affects the way
|
|
commits are displayed, but not the way the diff is shown e.g. with
|
|
<code>git</code> <code>log</code> <code>--raw</code>. To get full object names in a raw diff format,
|
|
use <code>--no-abbrev</code>.</p></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>format:</code><em><format-string></em>
|
|
</p>
|
|
<div class="paragraph"><p>The <code>format:</code><em><format-string></em> format allows you to specify which information
|
|
you want to show. It works a little bit like printf format,
|
|
with the notable exception that you get a newline with %n
|
|
instead of <code>\n</code>.</p></div>
|
|
<div class="paragraph"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"</em>
|
|
would show something like this:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>The author of fe6e0ee was Junio C Hamano, 23 hours ago
|
|
The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>The placeholders are:</p></div>
|
|
<div class="ulist"><ul>
|
|
<li>
|
|
<p>
|
|
Placeholders that expand to a single literal character:
|
|
</p>
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
<code>%n</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
newline
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%%</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
a raw <code>%</code>
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%x00</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
<code>%x</code> followed by two hexadecimal digits is replaced with a
|
|
byte with the hexadecimal digits' value (we will call this
|
|
"literal formatting code" in the rest of this document).
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
Placeholders that affect formatting of later placeholders:
|
|
</p>
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
<code>%Cred</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
switch color to red
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%Cgreen</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
switch color to green
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%Cblue</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
switch color to blue
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%Creset</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
reset color
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%C(</code><em><spec></em><code>)</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
color specification, as described under Values in the
|
|
"CONFIGURATION FILE" section of <a href="git-config.html">git-config(1)</a>. By
|
|
default, colors are shown only when enabled for log output
|
|
(by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and respecting
|
|
the <code>auto</code> settings of the former if we are going to a
|
|
terminal). <code>%C(auto,</code><em><spec></em><code>)</code> is accepted as a historical
|
|
synonym for the default (e.g., <code>%C(auto,red)</code>). Specifying
|
|
<code>%C(always,</code><em><spec></em><code>)</code> will show the colors even when color is
|
|
not otherwise enabled (though consider just using
|
|
<code>--color=always</code> to enable color for the whole output,
|
|
including this format and anything else git might color).
|
|
<code>auto</code> alone (i.e. <code>%C(auto)</code>) will turn on auto coloring
|
|
on the next placeholders until the color is switched
|
|
again.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%m</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
left (<), right (>) or boundary (<code>-</code>) mark
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%w(</code>[<em><w></em>[<code>,</code><em><i1></em>[<code>,</code><em><i2></em>]]]<code>)</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
switch line wrapping, like the <code>-w</code> option of
|
|
<a href="git-shortlog.html">git-shortlog(1)</a>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%<(</code><em><n></em>[<code>,</code>(<code>trunc</code>|<code>ltrunc</code>|<code>mtrunc</code>)]<code>)</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
make the next placeholder take at
|
|
least N column widths, padding spaces on
|
|
the right if necessary. Optionally
|
|
truncate (with ellipsis ..) at the left (ltrunc) <code>..</code><code>ft</code>,
|
|
the middle (mtrunc) <code>mi</code><code>..</code><code>le</code>, or the end
|
|
(trunc) <code>rig.</code>., if the output is longer than
|
|
<em><n></em> columns.
|
|
Note 1: that truncating
|
|
only works correctly with <em><n></em> >= 2.
|
|
Note 2: spaces around the <em><n></em> and <em><m></em> (see below)
|
|
values are optional.
|
|
Note 3: Emojis and other wide characters
|
|
will take two display columns, which may
|
|
over-run column boundaries.
|
|
Note 4: decomposed character combining marks
|
|
may be misplaced at padding boundaries.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%<|(</code><em><m></em> <code>)</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
make the next placeholder take at least until <em><m></em> th
|
|
display column, padding spaces on the right if necessary.
|
|
Use negative <em><m></em> values for column positions measured
|
|
from the right hand edge of the terminal window.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%>(</code><em><n></em><code>)</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>%>|(</code><em><m></em><code>)</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
similar to <code>%<(</code><em><n></em><code>)</code>, <code>%<|(</code><em><m></em><code>)</code> respectively,
|
|
but padding spaces on the left
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%>>(</code><em><n></em><code>)</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>%>>|(</code><em><m></em><code>)</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
similar to <code>%>(</code><em><n></em><code>)</code>, <code>%>|(</code><em><m></em><code>)</code>
|
|
respectively, except that if the next
|
|
placeholder takes more spaces than given and
|
|
there are spaces on its left, use those
|
|
spaces
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%><(</code><em><n></em><code>)</code>
|
|
</dt>
|
|
<dt class="hdlist1">
|
|
<code>%><|(</code><em><m></em><code>)</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
similar to <code>%<(</code><em><n></em><code>)</code>, <code>%<|(</code><em><m></em><code>)</code>
|
|
respectively, but padding both sides
|
|
(i.e. the text is centered)
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
Placeholders that expand to information extracted from the commit:
|
|
</p>
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
<code>%H</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
commit hash
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%h</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
abbreviated commit hash
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%T</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
tree hash
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%t</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
abbreviated tree hash
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%P</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
parent hashes
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%p</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
abbreviated parent hashes
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%an</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
author name
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%aN</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
author name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
|
|
or <a href="git-blame.html">git-blame(1)</a>)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%ae</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
author email
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%aE</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
author email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
|
|
or <a href="git-blame.html">git-blame(1)</a>)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%al</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
author email local-part (the part before the <code>@</code> sign)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%aL</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
author local-part (see <code>%al</code>) respecting .mailmap, see
|
|
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%ad</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
author date (format respects --date= option)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%aD</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
author date, RFC2822 style
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%ar</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
author date, relative
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%at</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
author date, UNIX timestamp
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%ai</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
author date, ISO 8601-like format
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%aI</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
author date, strict ISO 8601 format
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%as</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
author date, short format (<code>YYYY-MM-DD</code>)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%ah</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
author date, human style (like the <code>--date=human</code> option of
|
|
<a href="git-rev-list.html">git-rev-list(1)</a>)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%cn</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
committer name
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%cN</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
committer name (respecting .mailmap, see
|
|
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%ce</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
committer email
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%cE</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
committer email (respecting .mailmap, see
|
|
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%cl</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
committer email local-part (the part before the <code>@</code> sign)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%cL</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
committer local-part (see <code>%cl</code>) respecting .mailmap, see
|
|
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%cd</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
committer date (format respects --date= option)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%cD</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
committer date, RFC2822 style
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%cr</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
committer date, relative
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%ct</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
committer date, UNIX timestamp
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%ci</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
committer date, ISO 8601-like format
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%cI</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
committer date, strict ISO 8601 format
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%cs</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
committer date, short format (<code>YYYY-MM-DD</code>)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%ch</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
committer date, human style (like the <code>--date=human</code> option of
|
|
<a href="git-rev-list.html">git-rev-list(1)</a>)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%d</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
ref names, like the --decorate option of <a href="git-log.html">git-log(1)</a>
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%D</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
ref names without the " (", ")" wrapping.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%(decorate</code>[<code>:</code><em><option></em><code>,.</code>..]<code>)</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
ref names with custom decorations. The <code>decorate</code> string may be followed by a
|
|
colon and zero or more comma-separated options. Option values may contain
|
|
literal formatting codes. These must be used for commas (%x2C) and closing
|
|
parentheses (%x29), due to their role in the option syntax.
|
|
</p>
|
|
<div class="ulist"><ul>
|
|
<li>
|
|
<p>
|
|
<code>prefix=</code><em><value></em>: Shown before the list of ref names. Defaults to " +(+".
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>suffix=</code><em><value></em>: Shown after the list of ref names. Defaults to "<code>)</code>".
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>separator=</code><em><value></em>: Shown between ref names. Defaults to "<code>,</code> ".
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>pointer=</code><em><value></em>: Shown between HEAD and the branch it points to, if any.
|
|
Defaults to " +→+ ".
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>tag=</code><em><value></em>: Shown before tag names. Defaults to "<code>tag:</code> ".
|
|
</p>
|
|
</li>
|
|
</ul></div>
|
|
<div class="paragraph"><p>For example, to produce decorations with no wrapping
|
|
or tag annotations, and spaces as separators:</p></div>
|
|
<div class="paragraph"><p><code>%(decorate:prefix=,suffix=,tag=,separator= )</code></p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%(describe</code>[<code>:</code><em><option></em><code>,.</code>..]<code>)</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
human-readable name, like <a href="git-describe.html">git-describe(1)</a>; empty string for
|
|
undescribable commits. The <code>describe</code> string may be followed by a colon and
|
|
zero or more comma-separated options. Descriptions can be inconsistent when
|
|
tags are added or removed at the same time.
|
|
</p>
|
|
<div class="ulist"><ul>
|
|
<li>
|
|
<p>
|
|
<code>tags</code>[<code>=</code><em><bool-value></em>]: Instead of only considering annotated tags,
|
|
consider lightweight tags as well.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>abbrev=</code><em><number></em>: Instead of using the default number of hexadecimal digits
|
|
(which will vary according to the number of objects in the repository with a
|
|
default of 7) of the abbreviated object name, use <number> digits, or as many
|
|
digits as needed to form a unique object name.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>match=</code><em><pattern></em>: Only consider tags matching the given
|
|
<code>glob</code>(<code>7</code>) <em><pattern></em>, excluding the <code>refs/tags/</code> prefix.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>exclude=</code><em><pattern></em>: Do not consider tags matching the given
|
|
<code>glob</code>(<code>7</code>) <em><pattern></em>, excluding the <code>refs/tags/</code> prefix.
|
|
</p>
|
|
</li>
|
|
</ul></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%S</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
ref name given on the command line by which the commit was reached
|
|
(like <code>git</code> <code>log</code> <code>--source</code>), only works with <code>git</code> <code>log</code>
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%e</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
encoding
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%s</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
subject
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%f</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
sanitized subject line, suitable for a filename
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%b</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
body
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%B</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
raw body (unwrapped subject and body)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%N</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
commit notes
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%GG</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
raw verification message from GPG for a signed commit
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%G?</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
show "G" for a good (valid) signature,
|
|
"B" for a bad signature,
|
|
"U" for a good signature with unknown validity,
|
|
"X" for a good signature that has expired,
|
|
"Y" for a good signature made by an expired key,
|
|
"R" for a good signature made by a revoked key,
|
|
"E" if the signature cannot be checked (e.g. missing key)
|
|
and "N" for no signature
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%GS</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
show the name of the signer for a signed commit
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%GK</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
show the key used to sign a signed commit
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%GF</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
show the fingerprint of the key used to sign a signed commit
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%GP</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
show the fingerprint of the primary key whose subkey was used
|
|
to sign a signed commit
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%GT</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
show the trust level for the key used to sign a signed commit
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%gD</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
reflog selector, e.g., <code>refs/stash@</code>{1} or <code>refs/stash@</code>{2
|
|
<code>minutes</code> <code>ago</code>}; the format follows the rules described for the
|
|
<code>-g</code> option. The portion before the <code>@</code> is the refname as
|
|
given on the command line (so <code>git</code> <code>log</code> <code>-g</code> <code>refs/heads/master</code>
|
|
would yield <code>refs/heads/master@</code>{0}).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%gd</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
shortened reflog selector; same as %gD, but the refname
|
|
portion is shortened for human readability (so
|
|
<code>refs/heads/master</code> becomes just <code>master</code>).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%gn</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
reflog identity name
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%gN</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
reflog identity name (respecting .mailmap, see
|
|
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%ge</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
reflog identity email
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%gE</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
reflog identity email (respecting .mailmap, see
|
|
<a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%gs</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
reflog subject
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>%(trailers</code>[<code>:</code><em><option></em><code>,.</code>..]<code>)</code>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
display the trailers of the body as interpreted by
|
|
<a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>. The <code>trailers</code> string may be followed by
|
|
a colon and zero or more comma-separated options. If any option is provided
|
|
multiple times, the last occurrence wins.
|
|
</p>
|
|
<div class="ulist"><ul>
|
|
<li>
|
|
<p>
|
|
<code>key=</code><em><key></em>: only show trailers with specified <key>. Matching is done
|
|
case-insensitively and trailing colon is optional. If option is
|
|
given multiple times trailer lines matching any of the keys are
|
|
shown. This option automatically enables the <code>only</code> option so that
|
|
non-trailer lines in the trailer block are hidden. If that is not
|
|
desired it can be disabled with <code>only=false</code>. E.g.,
|
|
<code>%(trailers:key=Reviewed-by)</code> shows trailer lines with key
|
|
<code>Reviewed-by</code>.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>only</code>[<code>=</code><em><bool></em>]: select whether non-trailer lines from the trailer
|
|
block should be included.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>separator=</code><em><sep></em>: specify the separator inserted between trailer
|
|
lines. Defaults to a line feed character. The string <sep> may contain
|
|
the literal formatting codes described above. To use comma as
|
|
separator one must use %x2C as it would otherwise be parsed as
|
|
next option. E.g., <code>%(trailers:key=Ticket,separator=%x2C )</code>
|
|
shows all trailer lines whose key is "Ticket" separated by a comma
|
|
and a space.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>unfold</code>[<code>=</code><em><bool></em>]: make it behave as if interpret-trailer’s <code>--unfold</code>
|
|
option was given. E.g.,
|
|
<code>%(trailers:only,unfold=true)</code> unfolds and shows all trailer lines.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>keyonly</code>[<code>=</code><em><bool></em>]: only show the key part of the trailer.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>valueonly</code>[<code>=</code><em><bool></em>]: only show the value part of the trailer.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>key_value_separator=</code><em><sep></em>: specify the separator inserted between
|
|
the key and value of each trailer. Defaults to ": ". Otherwise it
|
|
shares the same semantics as <code>separator=</code><em><sep></em> above.
|
|
</p>
|
|
</li>
|
|
</ul></div>
|
|
</dd>
|
|
</dl></div>
|
|
</li>
|
|
</ul></div>
|
|
</li>
|
|
</ul></div>
|
|
<div class="admonitionblock">
|
|
<table><tr>
|
|
<td class="icon">
|
|
<div class="title">Note</div>
|
|
</td>
|
|
<td class="content">Some placeholders may depend on other options given to the
|
|
revision traversal engine. For example, the <code>%g*</code> reflog options will
|
|
insert an empty string unless we are traversing reflog entries (e.g., by
|
|
<code>git</code> <code>log</code> <code>-g</code>). The <code>%d</code> and <code>%D</code> placeholders will use the "short"
|
|
decoration format if <code>--decorate</code> was not already provided on the command
|
|
line.</td>
|
|
</tr></table>
|
|
</div>
|
|
<div class="paragraph"><p>The boolean options accept an optional value [<code>=</code><em><bool-value></em>]. The
|
|
values taken by <code>--type=bool</code> <a href="git-config.html">git-config(1)</a>, like <code>yes</code> and <code>off</code>,
|
|
are all accepted. Giving a boolean option without <code>=</code><em><value></em> is
|
|
equivalent to giving it with <code>=true</code>.</p></div>
|
|
<div class="paragraph"><p>If you add a <code>+</code> (plus sign) after <code>%</code> of a placeholder, a line-feed
|
|
is inserted immediately before the expansion if and only if the
|
|
placeholder expands to a non-empty string.</p></div>
|
|
<div class="paragraph"><p>If you add a <code>-</code> (minus sign) after <code>%</code> of a placeholder, all consecutive
|
|
line-feeds immediately preceding the expansion are deleted if and only if the
|
|
placeholder expands to an empty string.</p></div>
|
|
<div class="paragraph"><p>If you add a ' ' (space) after <code>%</code> of a placeholder, a space
|
|
is inserted immediately before the expansion if and only if the
|
|
placeholder expands to a non-empty string.</p></div>
|
|
<div class="ulist"><ul>
|
|
<li>
|
|
<p>
|
|
<code>tformat:</code>
|
|
</p>
|
|
<div class="paragraph"><p>The <code>tformat:</code> format works exactly like <code>format:</code>, except that it
|
|
provides "terminator" semantics instead of "separator" semantics. In
|
|
other words, each commit has the message terminator character (usually a
|
|
newline) appended, rather than a separator placed between entries.
|
|
This means that the final entry of a single-line format will be properly
|
|
terminated with a new line, just as the "oneline" format does.
|
|
For example:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>$ git log -2 --pretty=format:%h 4da45bef \
|
|
| perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
|
|
4da45be
|
|
7134973 -- NO NEWLINE
|
|
|
|
$ git log -2 --pretty=tformat:%h 4da45bef \
|
|
| perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
|
|
4da45be
|
|
7134973</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted
|
|
as if it has <code>tformat:</code> in front of it. For example, these two are
|
|
equivalent:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>$ git log -2 --pretty=tformat:%h 4da45bef
|
|
$ git log -2 --pretty=%h 4da45bef</code></pre>
|
|
</div></div>
|
|
</li>
|
|
</ul></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_raw_output_format">Raw output format</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>The raw output format from <code>git-diff-index</code>, <code>git-diff-tree</code>,
|
|
<code>git-diff-files</code> and <code>git</code> <code>diff</code> <code>--raw</code> are very similar.</p></div>
|
|
<div class="paragraph"><p>These commands all compare two sets of things; what is
|
|
compared differs:</p></div>
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
<code>git-diff-index</code> <em><tree-ish></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
compares the <em><tree-ish></em> and the files on the filesystem.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>git-diff-index</code> <code>--cached</code> <em><tree-ish></em>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
compares the <em><tree-ish></em> and the index.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>git-diff-tree</code> [<code>-r</code>] <em><tree-ish-1></em> <em><tree-ish-2></em> [<em><pattern></em>...]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
compares the trees named by the two arguments.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<code>git-diff-files</code> [<em><pattern></em>...]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
compares the index and the files on the filesystem.
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
<div class="paragraph"><p>The <code>git-diff-tree</code> command begins its output by printing the hash of
|
|
what is being compared. After that, all the commands print one output
|
|
line per changed file.</p></div>
|
|
<div class="paragraph"><p>An output line is formatted this way:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>in-place edit :100644 100644 bcd1234 0123456 M file0
|
|
copy-edit :100644 100644 abcd123 1234567 C68 file1 file2
|
|
rename-edit :100644 100644 abcd123 1234567 R86 file1 file3
|
|
create :000000 100644 0000000 1234567 A file4
|
|
delete :100644 000000 1234567 0000000 D file5
|
|
unmerged :000000 000000 0000000 0000000 U file6</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>That is, from the left to the right:</p></div>
|
|
<div class="olist arabic"><ol class="arabic">
|
|
<li>
|
|
<p>
|
|
a colon.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
mode for "src"; 000000 if creation or unmerged.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a space.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
mode for "dst"; 000000 if deletion or unmerged.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a space.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
sha1 for "src"; 0{40} if creation or unmerged.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a space.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
sha1 for "dst"; 0{40} if deletion, unmerged or "work tree out of sync with the index".
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a space.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
status, followed by optional "score" number.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a tab or a NUL when <code>-z</code> option is used.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
path for "src"
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a tab or a NUL when <code>-z</code> option is used; only exists for C or R.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
path for "dst"; only exists for C or R.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
an LF or a NUL when <code>-z</code> option is used, to terminate the record.
|
|
</p>
|
|
</li>
|
|
</ol></div>
|
|
<div class="paragraph"><p>Possible status letters are:</p></div>
|
|
<div class="ulist"><ul>
|
|
<li>
|
|
<p>
|
|
<code>A</code>: addition of a file
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>C</code>: copy of a file into a new one
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>D</code>: deletion of a file
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>M</code>: modification of the contents or mode of a file
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>R</code>: renaming of a file
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>T</code>: change in the type of the file (regular file, symbolic link or submodule)
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>U</code>: file is unmerged (you must complete the merge before it can
|
|
be committed)
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<code>X</code>: "unknown" change type (most probably a bug, please report it)
|
|
</p>
|
|
</li>
|
|
</ul></div>
|
|
<div class="paragraph"><p>Status letters <code>C</code> and <code>R</code> are always followed by a score (denoting the
|
|
percentage of similarity between the source and target of the move or
|
|
copy). Status letter <code>M</code> may be followed by a score (denoting the
|
|
percentage of dissimilarity) for file rewrites.</p></div>
|
|
<div class="paragraph"><p>The sha1 for "dst" is shown as all 0’s if a file on the filesystem
|
|
is out of sync with the index.</p></div>
|
|
<div class="paragraph"><p>Example:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>:100644 100644 5be4a4a 0000000 M file.c</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>Without the <code>-z</code> option, pathnames with "unusual" characters are
|
|
quoted as explained for the configuration variable <code>core.quotePath</code>
|
|
(see <a href="git-config.html">git-config(1)</a>). Using <code>-z</code> the filename is output
|
|
verbatim and the line is terminated by a NUL byte.</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_diff_format_for_merges">diff format for merges</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p><code>git-diff-tree</code>, <code>git-diff-files</code> and <code>git-diff</code> <code>--raw</code>
|
|
can take <code>-c</code> or <code>--cc</code> option
|
|
to generate diff output also for merge commits. The output differs
|
|
from the format described above in the following way:</p></div>
|
|
<div class="olist arabic"><ol class="arabic">
|
|
<li>
|
|
<p>
|
|
there is a colon for each parent
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
there are more "src" modes and "src" sha1
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
status is concatenated status characters for each parent
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
no optional "score" number
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
tab-separated pathname(s) of the file
|
|
</p>
|
|
</li>
|
|
</ol></div>
|
|
<div class="paragraph"><p>For <code>-c</code> and <code>--cc</code>, only the destination or final path is shown even
|
|
if the file was renamed on any side of history. With
|
|
<code>--combined-all-paths</code>, the name of the path in each parent is shown
|
|
followed by the name of the path in the merge commit.</p></div>
|
|
<div class="paragraph"><p>Examples for <code>-c</code> and <code>--cc</code> without <code>--combined-all-paths</code>:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>::100644 100644 100644 fabadb8 cc95eb0 4866510 MM desc.c
|
|
::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM bar.sh
|
|
::100644 100644 100644 e07d6c5 9042e82 ee91881 RR phooey.c</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>Examples when <code>--combined-all-paths</code> added to either <code>-c</code> or <code>--cc</code>:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>::100644 100644 100644 fabadb8 cc95eb0 4866510 MM desc.c desc.c desc.c
|
|
::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM foo.sh bar.sh bar.sh
|
|
::100644 100644 100644 e07d6c5 9042e82 ee91881 RR fooey.c fuey.c phooey.c</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
|
|
all parents.</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="generate_patch_text_with_p">Generating patch text with -p</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>Running
|
|
<a href="git-diff.html">git-diff(1)</a>,
|
|
<a href="git-log.html">git-log(1)</a>,
|
|
<a href="git-show.html">git-show(1)</a>,
|
|
<a href="git-diff-index.html">git-diff-index(1)</a>,
|
|
<a href="git-diff-tree.html">git-diff-tree(1)</a>, or
|
|
<a href="git-diff-files.html">git-diff-files(1)</a>
|
|
with the <code>-p</code> option produces patch text.
|
|
You can customize the creation of patch text via the
|
|
<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables
|
|
(see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p></div>
|
|
<div class="paragraph"><p>What the <code>-p</code> option produces is slightly different from the traditional
|
|
diff format:</p></div>
|
|
<div class="olist arabic"><ol class="arabic">
|
|
<li>
|
|
<p>
|
|
It is preceded by a "git diff" header that looks like this:
|
|
</p>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code>diff --git a/file1 b/file2</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
|
|
involved. Especially, even for a creation or a deletion,
|
|
<code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
|
|
<div class="paragraph"><p>When a rename/copy is involved, <code>file1</code> and <code>file2</code> show the
|
|
name of the source file of the rename/copy and the name of
|
|
the file that the rename/copy produces, respectively.</p></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
It is followed by one or more extended header lines:
|
|
</p>
|
|
<div class="verseblock">
|
|
<pre class="content"><code>old</code> <code>mode</code> <em><mode></em>
|
|
<code>new</code> <code>mode</code> <em><mode></em>
|
|
<code>deleted</code> <code>file</code> <code>mode</code> <em><mode></em>
|
|
<code>new</code> <code>file</code> <code>mode</code> <em><mode></em>
|
|
<code>copy</code> <code>from</code> <em><path></em>
|
|
<code>copy</code> <code>to</code> <em><path></em>
|
|
<code>rename</code> <code>from</code> <em><path></em>
|
|
<code>rename</code> <code>to</code> <em><path></em>
|
|
<code>similarity</code> <code>index</code> <em><number></em>
|
|
<code>dissimilarity</code> <code>index</code> <em><number></em>
|
|
<code>index</code> <em><hash></em><code>..</code><em><hash></em> <em><mode></em></pre>
|
|
<div class="attribution">
|
|
</div></div>
|
|
<div class="paragraph"><p>File modes <em><mode></em> are printed as 6-digit octal numbers including the file type
|
|
and file permission bits.</p></div>
|
|
<div class="paragraph"><p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p></div>
|
|
<div class="paragraph"><p>The similarity index is the percentage of unchanged lines, and
|
|
the dissimilarity index is the percentage of changed lines. It
|
|
is a rounded down integer, followed by a percent sign. The
|
|
similarity index value of 100% is thus reserved for two equal
|
|
files, while 100% dissimilarity means that no line from the old
|
|
file made it into the new one.</p></div>
|
|
<div class="paragraph"><p>The index line includes the blob object names before and after the change.
|
|
The <em><mode></em> is included if the file mode does not change; otherwise,
|
|
separate lines indicate the old and the new mode.</p></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
Pathnames with "unusual" characters are quoted as explained for
|
|
the configuration variable <code>core.quotePath</code> (see
|
|
<a href="git-config.html">git-config(1)</a>).
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
All the <code>file1</code> files in the output refer to files before the
|
|
commit, and all the <code>file2</code> files refer to files after the commit.
|
|
It is incorrect to apply each change to each file sequentially. For
|
|
example, this patch will swap a and b:
|
|
</p>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code>diff --git a/a b/b
|
|
rename from a
|
|
rename to b
|
|
diff --git a/b b/a
|
|
rename from b
|
|
rename to a</code></pre>
|
|
</div></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
Hunk headers mention the name of the function to which the hunk
|
|
applies. See "Defining a custom hunk-header" in
|
|
<a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor this to
|
|
specific languages.
|
|
</p>
|
|
</li>
|
|
</ol></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_combined_diff_format">Combined diff format</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
|
|
produce a <em>combined diff</em> when showing a merge. This is the default
|
|
format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
|
|
<a href="git-show.html">git-show(1)</a>. Note also that you can give suitable
|
|
<code>--diff-merges</code> option to any of these commands to force generation of
|
|
diffs in a specific format.</p></div>
|
|
<div class="paragraph"><p>A "combined diff" format looks like this:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>diff --combined describe.c
|
|
index fabadb8,cc95eb0..4866510
|
|
--- a/describe.c
|
|
+++ b/describe.c
|
|
@@@ -98,20 -98,12 +98,20 @@@
|
|
return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
|
|
}
|
|
|
|
- static void describe(char *arg)
|
|
-static void describe(struct commit *cmit, int last_one)
|
|
++static void describe(char *arg, int last_one)
|
|
{
|
|
+ unsigned char sha1[20];
|
|
+ struct commit *cmit;
|
|
struct commit_list *list;
|
|
static int initialized = 0;
|
|
struct commit_name *n;
|
|
|
|
+ if (get_sha1(arg, sha1) < 0)
|
|
+ usage(describe_usage);
|
|
+ cmit = lookup_commit_reference(sha1);
|
|
+ if (!cmit)
|
|
+ usage(describe_usage);
|
|
+
|
|
if (!initialized) {
|
|
initialized = 1;
|
|
for_each_ref(get_name);</code></pre>
|
|
</div></div>
|
|
<div class="olist arabic"><ol class="arabic">
|
|
<li>
|
|
<p>
|
|
It is preceded by a "git diff" header, that looks like
|
|
this (when the <code>-c</code> option is used):
|
|
</p>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code>diff --combined file</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>or like this (when the <code>--cc</code> option is used):</p></div>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code>diff --cc file</code></pre>
|
|
</div></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
It is followed by one or more extended header lines
|
|
(this example shows a merge with two parents):
|
|
</p>
|
|
<div class="verseblock">
|
|
<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em><code>..</code><em><hash></em>
|
|
<code>mode</code> <em><mode></em><code>,</code><em><mode></em><code>..</code><em><mode></em>
|
|
<code>new</code> <code>file</code> <code>mode</code> <em><mode></em>
|
|
<code>deleted</code> <code>file</code> <code>mode</code> <em><mode></em><code>,</code><em><mode></em></pre>
|
|
<div class="attribution">
|
|
</div></div>
|
|
<div class="paragraph"><p>The <code>mode</code> <em><mode></em><code>,</code><em><mode></em><code>..</code><em><mode></em> line appears only if at least one of
|
|
the <mode> is different from the rest. Extended headers with
|
|
information about detected content movement (renames and
|
|
copying detection) are designed to work with the diff of two
|
|
<em><tree-ish></em> and are not used by combined diff format.</p></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
It is followed by a two-line from-file/to-file header:
|
|
</p>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code>--- a/file
|
|
+++ b/file</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>Similar to the two-line header for the traditional <em>unified</em> diff
|
|
format, <code>/dev/null</code> is used to signal created or deleted
|
|
files.</p></div>
|
|
<div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
|
|
two-line from-file/to-file, you get an N+1 line from-file/to-file header,
|
|
where N is the number of parents in the merge commit:</p></div>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code>--- a/file
|
|
--- a/file
|
|
--- a/file
|
|
+++ b/file</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>This extended format can be useful if rename or copy detection is
|
|
active, to allow you to see the original name of the file in different
|
|
parents.</p></div>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
Chunk header format is modified to prevent people from
|
|
accidentally feeding it to <code>patch</code> <code>-p1</code>. Combined diff format
|
|
was created for review of merge commit changes, and was not
|
|
meant to be applied. The change is similar to the change in the
|
|
extended <em>index</em> header:
|
|
</p>
|
|
<div class="literalblock">
|
|
<div class="content">
|
|
<pre><code>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>There are (number of parents + 1) <code>@</code> characters in the chunk
|
|
header for combined diff format.</p></div>
|
|
</li>
|
|
</ol></div>
|
|
<div class="paragraph"><p>Unlike the traditional <em>unified</em> diff format, which shows two
|
|
files A and B with a single column that has <code>-</code> (minus — appears in A but removed in B), <code>+</code> (plus — missing in A but
|
|
added to B), or " " (space — unchanged) prefix, this format
|
|
compares two or more files file1, file2,… with one file X, and
|
|
shows how X differs from each of fileN. One column for each of
|
|
fileN is prepended to the output line to note how X’s line is
|
|
different from it.</p></div>
|
|
<div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
|
|
fileN but it does not appear in the result. A <code>+</code> character
|
|
in the column N means that the line appears in the result,
|
|
and fileN does not have that line (in other words, the line was
|
|
added, from the point of view of that parent).</p></div>
|
|
<div class="paragraph"><p>In the above example output, the function signature was changed
|
|
from both files (hence two <code>-</code> removals from both file1 and
|
|
file2, plus <code>++</code> to mean one line that was added does not appear
|
|
in either file1 or file2). Also, eight other lines are the same
|
|
from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
|
|
<div class="paragraph"><p>When shown by <code>git</code> <code>diff-tree</code> <code>-c</code>, it compares the parents of a
|
|
merge commit with the merge result (i.e. file1..fileN are the
|
|
parents). When shown by <code>git</code> <code>diff-files</code> <code>-c</code>, it compares the
|
|
two unresolved merge parents with the working tree file
|
|
(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
|
|
"their version").</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_other_diff_formats">other diff formats</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>The <code>--summary</code> option describes newly added, deleted, renamed and
|
|
copied files. The <code>--stat</code> option adds <code>diffstat</code>(1) graph to the
|
|
output. These options can be combined with other options, such as
|
|
<code>-p</code>, and are meant for human consumption.</p></div>
|
|
<div class="paragraph"><p>When showing a change that involves a rename or a copy, <code>--stat</code> output
|
|
formats the pathnames compactly by combining common prefix and suffix of
|
|
the pathnames. For example, a change that moves <code>arch/i386/Makefile</code> to
|
|
<code>arch/x86/Makefile</code> while modifying 4 lines will be shown like this:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>arch/{i386 => x86}/Makefile | 4 +--</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>The <code>--numstat</code> option gives the diffstat(1) information but is designed
|
|
for easier machine consumption. An entry in <code>--numstat</code> output looks
|
|
like this:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>1 2 README
|
|
3 1 arch/{i386 => x86}/Makefile</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>That is, from left to right:</p></div>
|
|
<div class="olist arabic"><ol class="arabic">
|
|
<li>
|
|
<p>
|
|
the number of added lines;
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a tab;
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
the number of deleted lines;
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a tab;
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
pathname (possibly with rename/copy information);
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a newline.
|
|
</p>
|
|
</li>
|
|
</ol></div>
|
|
<div class="paragraph"><p>When <code>-z</code> output option is in effect, the output is formatted this way:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>1 2 README NUL
|
|
3 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>That is:</p></div>
|
|
<div class="olist arabic"><ol class="arabic">
|
|
<li>
|
|
<p>
|
|
the number of added lines;
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a tab;
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
the number of deleted lines;
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a tab;
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a NUL (only exists if renamed/copied);
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
pathname in preimage;
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a NUL (only exists if renamed/copied);
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
pathname in postimage (only exists if renamed/copied);
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
a NUL.
|
|
</p>
|
|
</li>
|
|
</ol></div>
|
|
<div class="paragraph"><p>The extra <code>NUL</code> before the preimage path in renamed case is to allow
|
|
scripts that read the output to tell if the current record being read is
|
|
a single-path record or a rename/copy record without reading ahead.
|
|
After reading added and deleted lines, reading up to <code>NUL</code> would yield
|
|
the pathname, but if that is <code>NUL</code>, the record will show two paths.</p></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>
|