git-diff-tree.html

   1 <?xml version="1.0" encoding="UTF-8"?>
   2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   3     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
   4 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
   5 <head>
   6 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
   7 <meta name="generator" content="AsciiDoc 10.2.0" />
   8 <title>git-diff-tree(1)</title>
   9 <style type="text/css">
  10 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
  11
  12 /* Default font. */
  13 body {
  14   font-family: Georgia,serif;
  15 }
  16
  17 /* Title font. */
  18 h1, h2, h3, h4, h5, h6,
  19 div.title, caption.title,
  20 thead, p.table.header,
  21 #toctitle,
  22 #author, #revnumber, #revdate, #revremark,
  23 #footer {
  24   font-family: Arial,Helvetica,sans-serif;
  25 }
  26
  27 body {
  28   margin: 1em 5% 1em 5%;
  29 }
  30
  31 a {
  32   color: blue;
  33   text-decoration: underline;
  34 }
  35 a:visited {
  36   color: fuchsia;
  37 }
  38
  39 em {
  40   font-style: italic;
  41   color: navy;
  42 }
  43
  44 strong {
  45   font-weight: bold;
  46   color: #083194;
  47 }
  48
  49 h1, h2, h3, h4, h5, h6 {
  50   color: #527bbd;
  51   margin-top: 1.2em;
  52   margin-bottom: 0.5em;
  53   line-height: 1.3;
  54 }
  55
  56 h1, h2, h3 {
  57   border-bottom: 2px solid silver;
  58 }
  59 h2 {
  60   padding-top: 0.5em;
  61 }
  62 h3 {
  63   float: left;
  64 }
  65 h3 + * {
  66   clear: left;
  67 }
  68 h5 {
  69   font-size: 1.0em;
  70 }
  71
  72 div.sectionbody {
  73   margin-left: 0;
  74 }
  75
  76 hr {
  77   border: 1px solid silver;
  78 }
  79
  80 p {
  81   margin-top: 0.5em;
  82   margin-bottom: 0.5em;
  83 }
  84
  85 ul, ol, li > p {
  86   margin-top: 0;
  87 }
  88 ul > li     { color: #aaa; }
  89 ul > li > * { color: black; }
  90
  91 .monospaced, code, pre {
  92   font-family: "Courier New", Courier, monospace;
  93   font-size: inherit;
  94   color: navy;
  95   padding: 0;
  96   margin: 0;
  97 }
  98 pre {
  99   white-space: pre-wrap;
 100 }
 101
 102 #author {
 103   color: #527bbd;
 104   font-weight: bold;
 105   font-size: 1.1em;
 106 }
 107 #email {
 108 }
 109 #revnumber, #revdate, #revremark {
 110 }
 111
 112 #footer {
 113   font-size: small;
 114   border-top: 2px solid silver;
 115   padding-top: 0.5em;
 116   margin-top: 4.0em;
 117 }
 118 #footer-text {
 119   float: left;
 120   padding-bottom: 0.5em;
 121 }
 122 #footer-badges {
 123   float: right;
 124   padding-bottom: 0.5em;
 125 }
 126
 127 #preamble {
 128   margin-top: 1.5em;
 129   margin-bottom: 1.5em;
 130 }
 131 div.imageblock, div.exampleblock, div.verseblock,
 132 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 133 div.admonitionblock {
 134   margin-top: 1.0em;
 135   margin-bottom: 1.5em;
 136 }
 137 div.admonitionblock {
 138   margin-top: 2.0em;
 139   margin-bottom: 2.0em;
 140   margin-right: 10%;
 141   color: #606060;
 142 }
 143
 144 div.content { /* Block element content. */
 145   padding: 0;
 146 }
 147
 148 /* Block element titles. */
 149 div.title, caption.title {
 150   color: #527bbd;
 151   font-weight: bold;
 152   text-align: left;
 153   margin-top: 1.0em;
 154   margin-bottom: 0.5em;
 155 }
 156 div.title + * {
 157   margin-top: 0;
 158 }
 159
 160 td div.title:first-child {
 161   margin-top: 0.0em;
 162 }
 163 div.content div.title:first-child {
 164   margin-top: 0.0em;
 165 }
 166 div.content + div.title {
 167   margin-top: 0.0em;
 168 }
 169
 170 div.sidebarblock > div.content {
 171   background: #ffffee;
 172   border: 1px solid #dddddd;
 173   border-left: 4px solid #f0f0f0;
 174   padding: 0.5em;
 175 }
 176
 177 div.listingblock > div.content {
 178   border: 1px solid #dddddd;
 179   border-left: 5px solid #f0f0f0;
 180   background: #f8f8f8;
 181   padding: 0.5em;
 182 }
 183
 184 div.quoteblock, div.verseblock {
 185   padding-left: 1.0em;
 186   margin-left: 1.0em;
 187   margin-right: 10%;
 188   border-left: 5px solid #f0f0f0;
 189   color: #888;
 190 }
 191
 192 div.quoteblock > div.attribution {
 193   padding-top: 0.5em;
 194   text-align: right;
 195 }
 196
 197 div.verseblock > pre.content {
 198   font-family: inherit;
 199   font-size: inherit;
 200 }
 201 div.verseblock > div.attribution {
 202   padding-top: 0.75em;
 203   text-align: left;
 204 }
 205 /* DEPRECATED: Pre version 8.2.7 verse style literal block. */
 206 div.verseblock + div.attribution {
 207   text-align: left;
 208 }
 209
 210 div.admonitionblock .icon {
 211   vertical-align: top;
 212   font-size: 1.1em;
 213   font-weight: bold;
 214   text-decoration: underline;
 215   color: #527bbd;
 216   padding-right: 0.5em;
 217 }
 218 div.admonitionblock td.content {
 219   padding-left: 0.5em;
 220   border-left: 3px solid #dddddd;
 221 }
 222
 223 div.exampleblock > div.content {
 224   border-left: 3px solid #dddddd;
 225   padding-left: 0.5em;
 226 }
 227
 228 div.imageblock div.content { padding-left: 0; }
 229 span.image img { border-style: none; vertical-align: text-bottom; }
 230 a.image:visited { color: white; }
 231
 232 dl {
 233   margin-top: 0.8em;
 234   margin-bottom: 0.8em;
 235 }
 236 dt {
 237   margin-top: 0.5em;
 238   margin-bottom: 0;
 239   font-style: normal;
 240   color: navy;
 241 }
 242 dd > *:first-child {
 243   margin-top: 0.1em;
 244 }
 245
 246 ul, ol {
 247     list-style-position: outside;
 248 }
 249 ol.arabic {
 250   list-style-type: decimal;
 251 }
 252 ol.loweralpha {
 253   list-style-type: lower-alpha;
 254 }
 255 ol.upperalpha {
 256   list-style-type: upper-alpha;
 257 }
 258 ol.lowerroman {
 259   list-style-type: lower-roman;
 260 }
 261 ol.upperroman {
 262   list-style-type: upper-roman;
 263 }
 264
 265 div.compact ul, div.compact ol,
 266 div.compact p, div.compact p,
 267 div.compact div, div.compact div {
 268   margin-top: 0.1em;
 269   margin-bottom: 0.1em;
 270 }
 271
 272 tfoot {
 273   font-weight: bold;
 274 }
 275 td > div.verse {
 276   white-space: pre;
 277 }
 278
 279 div.hdlist {
 280   margin-top: 0.8em;
 281   margin-bottom: 0.8em;
 282 }
 283 div.hdlist tr {
 284   padding-bottom: 15px;
 285 }
 286 dt.hdlist1.strong, td.hdlist1.strong {
 287   font-weight: bold;
 288 }
 289 td.hdlist1 {
 290   vertical-align: top;
 291   font-style: normal;
 292   padding-right: 0.8em;
 293   color: navy;
 294 }
 295 td.hdlist2 {
 296   vertical-align: top;
 297 }
 298 div.hdlist.compact tr {
 299   margin: 0;
 300   padding-bottom: 0;
 301 }
 302
 303 .comment {
 304   background: yellow;
 305 }
 306
 307 .footnote, .footnoteref {
 308   font-size: 0.8em;
 309 }
 310
 311 span.footnote, span.footnoteref {
 312   vertical-align: super;
 313 }
 314
 315 #footnotes {
 316   margin: 20px 0 20px 0;
 317   padding: 7px 0 0 0;
 318 }
 319
 320 #footnotes div.footnote {
 321   margin: 0 0 5px 0;
 322 }
 323
 324 #footnotes hr {
 325   border: none;
 326   border-top: 1px solid silver;
 327   height: 1px;
 328   text-align: left;
 329   margin-left: 0;
 330   width: 20%;
 331   min-width: 100px;
 332 }
 333
 334 div.colist td {
 335   padding-right: 0.5em;
 336   padding-bottom: 0.3em;
 337   vertical-align: top;
 338 }
 339 div.colist td img {
 340   margin-top: 0.3em;
 341 }
 342
 343 @media print {
 344   #footer-badges { display: none; }
 345 }
 346
 347 #toc {
 348   margin-bottom: 2.5em;
 349 }
 350
 351 #toctitle {
 352   color: #527bbd;
 353   font-size: 1.1em;
 354   font-weight: bold;
 355   margin-top: 1.0em;
 356   margin-bottom: 0.1em;
 357 }
 358
 359 div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
 360   margin-top: 0;
 361   margin-bottom: 0;
 362 }
 363 div.toclevel2 {
 364   margin-left: 2em;
 365   font-size: 0.9em;
 366 }
 367 div.toclevel3 {
 368   margin-left: 4em;
 369   font-size: 0.9em;
 370 }
 371 div.toclevel4 {
 372   margin-left: 6em;
 373   font-size: 0.9em;
 374 }
 375
 376 span.aqua { color: aqua; }
 377 span.black { color: black; }
 378 span.blue { color: blue; }
 379 span.fuchsia { color: fuchsia; }
 380 span.gray { color: gray; }
 381 span.green { color: green; }
 382 span.lime { color: lime; }
 383 span.maroon { color: maroon; }
 384 span.navy { color: navy; }
 385 span.olive { color: olive; }
 386 span.purple { color: purple; }
 387 span.red { color: red; }
 388 span.silver { color: silver; }
 389 span.teal { color: teal; }
 390 span.white { color: white; }
 391 span.yellow { color: yellow; }
 392
 393 span.aqua-background { background: aqua; }
 394 span.black-background { background: black; }
 395 span.blue-background { background: blue; }
 396 span.fuchsia-background { background: fuchsia; }
 397 span.gray-background { background: gray; }
 398 span.green-background { background: green; }
 399 span.lime-background { background: lime; }
 400 span.maroon-background { background: maroon; }
 401 span.navy-background { background: navy; }
 402 span.olive-background { background: olive; }
 403 span.purple-background { background: purple; }
 404 span.red-background { background: red; }
 405 span.silver-background { background: silver; }
 406 span.teal-background { background: teal; }
 407 span.white-background { background: white; }
 408 span.yellow-background { background: yellow; }
 409
 410 span.big { font-size: 2em; }
 411 span.small { font-size: 0.6em; }
 412
 413 span.underline { text-decoration: underline; }
 414 span.overline { text-decoration: overline; }
 415 span.line-through { text-decoration: line-through; }
 416
 417 div.unbreakable { page-break-inside: avoid; }
 418
 419
 420 /*
 421  * xhtml11 specific
 422  *
 423  * */
 424
 425 div.tableblock {
 426   margin-top: 1.0em;
 427   margin-bottom: 1.5em;
 428 }
 429 div.tableblock > table {
 430   border: 3px solid #527bbd;
 431 }
 432 thead, p.table.header {
 433   font-weight: bold;
 434   color: #527bbd;
 435 }
 436 p.table {
 437   margin-top: 0;
 438 }
 439 /* Because the table frame attribute is overridden by CSS in most browsers. */
 440 div.tableblock > table[frame="void"] {
 441   border-style: none;
 442 }
 443 div.tableblock > table[frame="hsides"] {
 444   border-left-style: none;
 445   border-right-style: none;
 446 }
 447 div.tableblock > table[frame="vsides"] {
 448   border-top-style: none;
 449   border-bottom-style: none;
 450 }
 451
 452
 453 /*
 454  * html5 specific
 455  *
 456  * */
 457
 458 table.tableblock {
 459   margin-top: 1.0em;
 460   margin-bottom: 1.5em;
 461 }
 462 thead, p.tableblock.header {
 463   font-weight: bold;
 464   color: #527bbd;
 465 }
 466 p.tableblock {
 467   margin-top: 0;
 468 }
 469 table.tableblock {
 470   border-width: 3px;
 471   border-spacing: 0px;
 472   border-style: solid;
 473   border-color: #527bbd;
 474   border-collapse: collapse;
 475 }
 476 th.tableblock, td.tableblock {
 477   border-width: 1px;
 478   padding: 4px;
 479   border-style: solid;
 480   border-color: #527bbd;
 481 }
 482
 483 table.tableblock.frame-topbot {
 484   border-left-style: hidden;
 485   border-right-style: hidden;
 486 }
 487 table.tableblock.frame-sides {
 488   border-top-style: hidden;
 489   border-bottom-style: hidden;
 490 }
 491 table.tableblock.frame-none {
 492   border-style: hidden;
 493 }
 494
 495 th.tableblock.halign-left, td.tableblock.halign-left {
 496   text-align: left;
 497 }
 498 th.tableblock.halign-center, td.tableblock.halign-center {
 499   text-align: center;
 500 }
 501 th.tableblock.halign-right, td.tableblock.halign-right {
 502   text-align: right;
 503 }
 504
 505 th.tableblock.valign-top, td.tableblock.valign-top {
 506   vertical-align: top;
 507 }
 508 th.tableblock.valign-middle, td.tableblock.valign-middle {
 509   vertical-align: middle;
 510 }
 511 th.tableblock.valign-bottom, td.tableblock.valign-bottom {
 512   vertical-align: bottom;
 513 }
 514
 515
 516 /*
 517  * manpage specific
 518  *
 519  * */
 520
 521 body.manpage h1 {
 522   padding-top: 0.5em;
 523   padding-bottom: 0.5em;
 524   border-top: 2px solid silver;
 525   border-bottom: 2px solid silver;
 526 }
 527 body.manpage h2 {
 528   border-style: none;
 529 }
 530 body.manpage div.sectionbody {
 531   margin-left: 3em;
 532 }
 533
 534 @media print {
 535   body.manpage div#toc { display: none; }
 536 }
 537
 538
 539 </style>
 540 <script type="text/javascript">
 541 /*<![CDATA[*/
 542 var asciidoc = {  // Namespace.
 543
 544 /////////////////////////////////////////////////////////////////////
 545 // Table Of Contents generator
 546 /////////////////////////////////////////////////////////////////////
 547
 548 /* Author: Mihai Bazon, September 2002
 549  * http://students.infoiasi.ro/~mishoo
 550  *
 551  * Table Of Content generator
 552  * Version: 0.4
 553  *
 554  * Feel free to use this script under the terms of the GNU General Public
 555  * License, as long as you do not remove or alter this notice.
 556  */
 557
 558  /* modified by Troy D. Hanson, September 2006. License: GPL */
 559  /* modified by Stuart Rackham, 2006, 2009. License: GPL */
 560
 561 // toclevels = 1..4.
 562 toc: function (toclevels) {
 563
 564   function getText(el) {
 565     var text = "";
 566     for (var i = el.firstChild; i != null; i = i.nextSibling) {
 567       if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
 568         text += i.data;
 569       else if (i.firstChild != null)
 570         text += getText(i);
 571     }
 572     return text;
 573   }
 574
 575   function TocEntry(el, text, toclevel) {
 576     this.element = el;
 577     this.text = text;
 578     this.toclevel = toclevel;
 579   }
 580
 581   function tocEntries(el, toclevels) {
 582     var result = new Array;
 583     var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
 584     // Function that scans the DOM tree for header elements (the DOM2
 585     // nodeIterator API would be a better technique but not supported by all
 586     // browsers).
 587     var iterate = function (el) {
 588       for (var i = el.firstChild; i != null; i = i.nextSibling) {
 589         if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
 590           var mo = re.exec(i.tagName);
 591           if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
 592             result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
 593           }
 594           iterate(i);
 595         }
 596       }
 597     }
 598     iterate(el);
 599     return result;
 600   }
 601
 602   var toc = document.getElementById("toc");
 603   if (!toc) {
 604     return;
 605   }
 606
 607   // Delete existing TOC entries in case we're reloading the TOC.
 608   var tocEntriesToRemove = [];
 609   var i;
 610   for (i = 0; i < toc.childNodes.length; i++) {
 611     var entry = toc.childNodes[i];
 612     if (entry.nodeName.toLowerCase() == 'div'
 613      && entry.getAttribute("class")
 614      && entry.getAttribute("class").match(/^toclevel/))
 615       tocEntriesToRemove.push(entry);
 616   }
 617   for (i = 0; i < tocEntriesToRemove.length; i++) {
 618     toc.removeChild(tocEntriesToRemove[i]);
 619   }
 620
 621   // Rebuild TOC entries.
 622   var entries = tocEntries(document.getElementById("content"), toclevels);
 623   for (var i = 0; i < entries.length; ++i) {
 624     var entry = entries[i];
 625     if (entry.element.id == "")
 626       entry.element.id = "_toc_" + i;
 627     var a = document.createElement("a");
 628     a.href = "#" + entry.element.id;
 629     a.appendChild(document.createTextNode(entry.text));
 630     var div = document.createElement("div");
 631     div.appendChild(a);
 632     div.className = "toclevel" + entry.toclevel;
 633     toc.appendChild(div);
 634   }
 635   if (entries.length == 0)
 636     toc.parentNode.removeChild(toc);
 637 },
 638
 639
 640 /////////////////////////////////////////////////////////////////////
 641 // Footnotes generator
 642 /////////////////////////////////////////////////////////////////////
 643
 644 /* Based on footnote generation code from:
 645  * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
 646  */
 647
 648 footnotes: function () {
 649   // Delete existing footnote entries in case we're reloading the footnodes.
 650   var i;
 651   var noteholder = document.getElementById("footnotes");
 652   if (!noteholder) {
 653     return;
 654   }
 655   var entriesToRemove = [];
 656   for (i = 0; i < noteholder.childNodes.length; i++) {
 657     var entry = noteholder.childNodes[i];
 658     if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
 659       entriesToRemove.push(entry);
 660   }
 661   for (i = 0; i < entriesToRemove.length; i++) {
 662     noteholder.removeChild(entriesToRemove[i]);
 663   }
 664
 665   // Rebuild footnote entries.
 666   var cont = document.getElementById("content");
 667   var spans = cont.getElementsByTagName("span");
 668   var refs = {};
 669   var n = 0;
 670   for (i=0; i<spans.length; i++) {
 671     if (spans[i].className == "footnote") {
 672       n++;
 673       var note = spans[i].getAttribute("data-note");
 674       if (!note) {
 675         // Use [\s\S] in place of . so multi-line matches work.
 676         // Because JavaScript has no s (dotall) regex flag.
 677         note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
 678         spans[i].innerHTML =
 679           "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
 680           "' title='View footnote' class='footnote'>" + n + "</a>]";
 681         spans[i].setAttribute("data-note", note);
 682       }
 683       noteholder.innerHTML +=
 684         "<div class='footnote' id='_footnote_" + n + "'>" +
 685         "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
 686         n + "</a>. " + note + "</div>";
 687       var id =spans[i].getAttribute("id");
 688       if (id != null) refs["#"+id] = n;
 689     }
 690   }
 691   if (n == 0)
 692     noteholder.parentNode.removeChild(noteholder);
 693   else {
 694     // Process footnoterefs.
 695     for (i=0; i<spans.length; i++) {
 696       if (spans[i].className == "footnoteref") {
 697         var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
 698         href = href.match(/#.*/)[0];  // Because IE return full URL.
 699         n = refs[href];
 700         spans[i].innerHTML =
 701           "[<a href='#_footnote_" + n +
 702           "' title='View footnote' class='footnote'>" + n + "</a>]";
 703       }
 704     }
 705   }
 706 },
 707
 708 install: function(toclevels) {
 709   var timerId;
 710
 711   function reinstall() {
 712     asciidoc.footnotes();
 713     if (toclevels) {
 714       asciidoc.toc(toclevels);
 715     }
 716   }
 717
 718   function reinstallAndRemoveTimer() {
 719     clearInterval(timerId);
 720     reinstall();
 721   }
 722
 723   timerId = setInterval(reinstall, 500);
 724   if (document.addEventListener)
 725     document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
 726   else
 727     window.onload = reinstallAndRemoveTimer;
 728 }
 729
 730 }
 731 asciidoc.install();
 732 /*]]>*/
 733 </script>
 734 </head>
 735 <body class="manpage">
 736 <div id="header">
 737 <h1>
 738 git-diff-tree(1) Manual Page
 739 </h1>
 740 <h2>NAME</h2>
 741 <div class="sectionbody">
 742 <p>git-diff-tree -
 743    Compares the content and mode of blobs found via two tree objects
 744 </p>
 745 </div>
 746 </div>
 747 <div id="content">
 748 <div class="sect1">
 749 <h2 id="_synopsis">SYNOPSIS</h2>
 750 <div class="sectionbody">
 751 <div class="verseblock">
 752 <pre class="content"><em>git diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
 753               [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]
 754               [&lt;common-diff-options&gt;] &lt;tree-ish&gt; [&lt;tree-ish&gt;] [&lt;path&gt;&#8230;]</pre>
 755 <div class="attribution">
 756 </div></div>
 757 </div>
 758 </div>
 759 <div class="sect1">
 760 <h2 id="_description">DESCRIPTION</h2>
 761 <div class="sectionbody">
 762 <div class="paragraph"><p>Compares the content and mode of the blobs found via two tree objects.</p></div>
 763 <div class="paragraph"><p>If there is only one &lt;tree-ish&gt; given, the commit is compared with its parents
 764 (see --stdin below).</p></div>
 765 <div class="paragraph"><p>Note that <em>git diff-tree</em> can use the tree encapsulated in a commit object.</p></div>
 766 </div>
 767 </div>
 768 <div class="sect1">
 769 <h2 id="_options">OPTIONS</h2>
 770 <div class="sectionbody">
 771 <div class="dlist"><dl>
 772 <dt class="hdlist1">
 773 -p
 774 </dt>
 775 <dt class="hdlist1">
 776 -u
 777 </dt>
 778 <dt class="hdlist1">
 779 --patch
 780 </dt>
 781 <dd>
 782 <p>
 783         Generate patch (see section titled
 784 "Generating patch text with -p").
 785 </p>
 786 </dd>
 787 <dt class="hdlist1">
 788 -s
 789 </dt>
 790 <dt class="hdlist1">
 791 --no-patch
 792 </dt>
 793 <dd>
 794 <p>
 795         Suppress diff output. Useful for commands like <code>git show</code> that
 796         show the patch by default, or to cancel the effect of <code>--patch</code>.
 797 </p>
 798 </dd>
 799 <dt class="hdlist1">
 800 -U&lt;n&gt;
 801 </dt>
 802 <dt class="hdlist1">
 803 --unified=&lt;n&gt;
 804 </dt>
 805 <dd>
 806 <p>
 807         Generate diffs with &lt;n&gt; lines of context instead of
 808         the usual three.
 809         Implies <code>--patch</code>.
 810 </p>
 811 </dd>
 812 <dt class="hdlist1">
 813 --output=&lt;file&gt;
 814 </dt>
 815 <dd>
 816 <p>
 817         Output to a specific file instead of stdout.
 818 </p>
 819 </dd>
 820 <dt class="hdlist1">
 821 --output-indicator-new=&lt;char&gt;
 822 </dt>
 823 <dt class="hdlist1">
 824 --output-indicator-old=&lt;char&gt;
 825 </dt>
 826 <dt class="hdlist1">
 827 --output-indicator-context=&lt;char&gt;
 828 </dt>
 829 <dd>
 830 <p>
 831         Specify the character used to indicate new, old or context
 832         lines in the generated patch. Normally they are <em>+</em>, <em>-</em> and
 833         ' ' respectively.
 834 </p>
 835 </dd>
 836 <dt class="hdlist1">
 837 --raw
 838 </dt>
 839 <dd>
 840 <p>
 841         Generate the diff in raw format.
 842         This is the default.
 843 </p>
 844 </dd>
 845 <dt class="hdlist1">
 846 --patch-with-raw
 847 </dt>
 848 <dd>
 849 <p>
 850         Synonym for <code>-p --raw</code>.
 851 </p>
 852 </dd>
 853 <dt class="hdlist1">
 854 --indent-heuristic
 855 </dt>
 856 <dd>
 857 <p>
 858         Enable the heuristic that shifts diff hunk boundaries to make patches
 859         easier to read. This is the default.
 860 </p>
 861 </dd>
 862 <dt class="hdlist1">
 863 --no-indent-heuristic
 864 </dt>
 865 <dd>
 866 <p>
 867         Disable the indent heuristic.
 868 </p>
 869 </dd>
 870 <dt class="hdlist1">
 871 --minimal
 872 </dt>
 873 <dd>
 874 <p>
 875         Spend extra time to make sure the smallest possible
 876         diff is produced.
 877 </p>
 878 </dd>
 879 <dt class="hdlist1">
 880 --patience
 881 </dt>
 882 <dd>
 883 <p>
 884         Generate a diff using the "patience diff" algorithm.
 885 </p>
 886 </dd>
 887 <dt class="hdlist1">
 888 --histogram
 889 </dt>
 890 <dd>
 891 <p>
 892         Generate a diff using the "histogram diff" algorithm.
 893 </p>
 894 </dd>
 895 <dt class="hdlist1">
 896 --anchored=&lt;text&gt;
 897 </dt>
 898 <dd>
 899 <p>
 900         Generate a diff using the "anchored diff" algorithm.
 901 </p>
 902 <div class="paragraph"><p>This option may be specified more than once.</p></div>
 903 <div class="paragraph"><p>If a line exists in both the source and destination, exists only once,
 904 and starts with this text, this algorithm attempts to prevent it from
 905 appearing as a deletion or addition in the output. It uses the "patience
 906 diff" algorithm internally.</p></div>
 907 </dd>
 908 <dt class="hdlist1">
 909 --diff-algorithm={patience|minimal|histogram|myers}
 910 </dt>
 911 <dd>
 912 <p>
 913         Choose a diff algorithm. The variants are as follows:
 914 </p>
 915 <div class="openblock">
 916 <div class="content">
 917 <div class="dlist"><dl>
 918 <dt class="hdlist1">
 919 <code>default</code>, <code>myers</code>
 920 </dt>
 921 <dd>
 922 <p>
 923         The basic greedy diff algorithm. Currently, this is the default.
 924 </p>
 925 </dd>
 926 <dt class="hdlist1">
 927 <code>minimal</code>
 928 </dt>
 929 <dd>
 930 <p>
 931         Spend extra time to make sure the smallest possible diff is
 932         produced.
 933 </p>
 934 </dd>
 935 <dt class="hdlist1">
 936 <code>patience</code>
 937 </dt>
 938 <dd>
 939 <p>
 940         Use "patience diff" algorithm when generating patches.
 941 </p>
 942 </dd>
 943 <dt class="hdlist1">
 944 <code>histogram</code>
 945 </dt>
 946 <dd>
 947 <p>
 948         This algorithm extends the patience algorithm to "support
 949         low-occurrence common elements".
 950 </p>
 951 </dd>
 952 </dl></div>
 953 </div></div>
 954 <div class="paragraph"><p>For instance, if you configured the <code>diff.algorithm</code> variable to a
 955 non-default value and want to use the default one, then you
 956 have to use <code>--diff-algorithm=default</code> option.</p></div>
 957 </dd>
 958 <dt class="hdlist1">
 959 --stat[=&lt;width&gt;[,&lt;name-width&gt;[,&lt;count&gt;]]]
 960 </dt>
 961 <dd>
 962 <p>
 963         Generate a diffstat. By default, as much space as necessary
 964         will be used for the filename part, and the rest for the graph
 965         part. Maximum width defaults to terminal width, or 80 columns
 966         if not connected to a terminal, and can be overridden by
 967         <code>&lt;width&gt;</code>. The width of the filename part can be limited by
 968         giving another width <code>&lt;name-width&gt;</code> after a comma. The width
 969         of the graph part can be limited by using
 970         <code>--stat-graph-width=&lt;width&gt;</code> (affects all commands generating
 971         a stat graph) or by setting <code>diff.statGraphWidth=&lt;width&gt;</code>
 972         (does not affect <code>git format-patch</code>).
 973         By giving a third parameter <code>&lt;count&gt;</code>, you can limit the
 974         output to the first <code>&lt;count&gt;</code> lines, followed by <code>...</code> if
 975         there are more.
 976 </p>
 977 <div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=&lt;width&gt;</code>,
 978 <code>--stat-name-width=&lt;name-width&gt;</code> and <code>--stat-count=&lt;count&gt;</code>.</p></div>
 979 </dd>
 980 <dt class="hdlist1">
 981 --compact-summary
 982 </dt>
 983 <dd>
 984 <p>
 985         Output a condensed summary of extended header information such
 986         as file creations or deletions ("new" or "gone", optionally "+l"
 987         if it&#8217;s a symlink) and mode changes ("+x" or "-x" for adding
 988         or removing executable bit respectively) in diffstat. The
 989         information is put between the filename part and the graph
 990         part. Implies <code>--stat</code>.
 991 </p>
 992 </dd>
 993 <dt class="hdlist1">
 994 --numstat
 995 </dt>
 996 <dd>
 997 <p>
 998         Similar to <code>--stat</code>, but shows number of added and
 999         deleted lines in decimal notation and pathname without
1000         abbreviation, to make it more machine friendly.  For
1001         binary files, outputs two <code>-</code> instead of saying
1002         <code>0 0</code>.
1003 </p>
1004 </dd>
1005 <dt class="hdlist1">
1006 --shortstat
1007 </dt>
1008 <dd>
1009 <p>
1010         Output only the last line of the <code>--stat</code> format containing total
1011         number of modified files, as well as number of added and deleted
1012         lines.
1013 </p>
1014 </dd>
1015 <dt class="hdlist1">
1016 -X[&lt;param1,param2,&#8230;&gt;]
1017 </dt>
1018 <dt class="hdlist1">
1019 --dirstat[=&lt;param1,param2,&#8230;&gt;]
1020 </dt>
1021 <dd>
1022 <p>
1023         Output the distribution of relative amount of changes for each
1024         sub-directory. The behavior of <code>--dirstat</code> can be customized by
1025         passing it a comma separated list of parameters.
1026         The defaults are controlled by the <code>diff.dirstat</code> configuration
1027         variable (see <a href="git-config.html">git-config(1)</a>).
1028         The following parameters are available:
1029 </p>
1030 <div class="openblock">
1031 <div class="content">
1032 <div class="dlist"><dl>
1033 <dt class="hdlist1">
1034 <code>changes</code>
1035 </dt>
1036 <dd>
1037 <p>
1038         Compute the dirstat numbers by counting the lines that have been
1039         removed from the source, or added to the destination. This ignores
1040         the amount of pure code movements within a file.  In other words,
1041         rearranging lines in a file is not counted as much as other changes.
1042         This is the default behavior when no parameter is given.
1043 </p>
1044 </dd>
1045 <dt class="hdlist1">
1046 <code>lines</code>
1047 </dt>
1048 <dd>
1049 <p>
1050         Compute the dirstat numbers by doing the regular line-based diff
1051         analysis, and summing the removed/added line counts. (For binary
1052         files, count 64-byte chunks instead, since binary files have no
1053         natural concept of lines). This is a more expensive <code>--dirstat</code>
1054         behavior than the <code>changes</code> behavior, but it does count rearranged
1055         lines within a file as much as other changes. The resulting output
1056         is consistent with what you get from the other <code>--*stat</code> options.
1057 </p>
1058 </dd>
1059 <dt class="hdlist1">
1060 <code>files</code>
1061 </dt>
1062 <dd>
1063 <p>
1064         Compute the dirstat numbers by counting the number of files changed.
1065         Each changed file counts equally in the dirstat analysis. This is
1066         the computationally cheapest <code>--dirstat</code> behavior, since it does
1067         not have to look at the file contents at all.
1068 </p>
1069 </dd>
1070 <dt class="hdlist1">
1071 <code>cumulative</code>
1072 </dt>
1073 <dd>
1074 <p>
1075         Count changes in a child directory for the parent directory as well.
1076         Note that when using <code>cumulative</code>, the sum of the percentages
1077         reported may exceed 100%. The default (non-cumulative) behavior can
1078         be specified with the <code>noncumulative</code> parameter.
1079 </p>
1080 </dd>
1081 <dt class="hdlist1">
1082 &lt;limit&gt;
1083 </dt>
1084 <dd>
1085 <p>
1086         An integer parameter specifies a cut-off percent (3% by default).
1087         Directories contributing less than this percentage of the changes
1088         are not shown in the output.
1089 </p>
1090 </dd>
1091 </dl></div>
1092 </div></div>
1093 <div class="paragraph"><p>Example: The following will count changed files, while ignoring
1094 directories with less than 10% of the total amount of changed files,
1095 and accumulating child directory counts in the parent directories:
1096 <code>--dirstat=files,10,cumulative</code>.</p></div>
1097 </dd>
1098 <dt class="hdlist1">
1099 --cumulative
1100 </dt>
1101 <dd>
1102 <p>
1103         Synonym for --dirstat=cumulative
1104 </p>
1105 </dd>
1106 <dt class="hdlist1">
1107 --dirstat-by-file[=&lt;param1,param2&gt;&#8230;]
1108 </dt>
1109 <dd>
1110 <p>
1111         Synonym for --dirstat=files,param1,param2&#8230;
1112 </p>
1113 </dd>
1114 <dt class="hdlist1">
1115 --summary
1116 </dt>
1117 <dd>
1118 <p>
1119         Output a condensed summary of extended header information
1120         such as creations, renames and mode changes.
1121 </p>
1122 </dd>
1123 <dt class="hdlist1">
1124 --patch-with-stat
1125 </dt>
1126 <dd>
1127 <p>
1128         Synonym for <code>-p --stat</code>.
1129 </p>
1130 </dd>
1131 <dt class="hdlist1">
1132 -z
1133 </dt>
1134 <dd>
1135 <p>
1136         When <code>--raw</code>, <code>--numstat</code>, <code>--name-only</code> or <code>--name-status</code> has been
1137         given, do not munge pathnames and use NULs as output field terminators.
1138 </p>
1139 <div class="paragraph"><p>Without this option, pathnames with "unusual" characters are quoted as
1140 explained for the configuration variable <code>core.quotePath</code> (see
1141 <a href="git-config.html">git-config(1)</a>).</p></div>
1142 </dd>
1143 <dt class="hdlist1">
1144 --name-only
1145 </dt>
1146 <dd>
1147 <p>
1148         Show only names of changed files. The file names are often encoded in UTF-8.
1149         For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a>
1150         manual page.
1151 </p>
1152 </dd>
1153 <dt class="hdlist1">
1154 --name-status
1155 </dt>
1156 <dd>
1157 <p>
1158         Show only names and status of changed files. See the description
1159         of the <code>--diff-filter</code> option on what the status letters mean.
1160         Just like <code>--name-only</code> the file names are often encoded in UTF-8.
1161 </p>
1162 </dd>
1163 <dt class="hdlist1">
1164 --submodule[=&lt;format&gt;]
1165 </dt>
1166 <dd>
1167 <p>
1168         Specify how differences in submodules are shown.  When specifying
1169         <code>--submodule=short</code> the <em>short</em> format is used.  This format just
1170         shows the names of the commits at the beginning and end of the range.
1171         When <code>--submodule</code> or <code>--submodule=log</code> is specified, the <em>log</em>
1172         format is used.  This format lists the commits in the range like
1173         <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does.  When <code>--submodule=diff</code>
1174         is specified, the <em>diff</em> format is used.  This format shows an
1175         inline diff of the changes in the submodule contents between the
1176         commit range.  Defaults to <code>diff.submodule</code> or the <em>short</em> format
1177         if the config option is unset.
1178 </p>
1179 </dd>
1180 <dt class="hdlist1">
1181 --color[=&lt;when&gt;]
1182 </dt>
1183 <dd>
1184 <p>
1185         Show colored diff.
1186         <code>--color</code> (i.e. without <em>=&lt;when&gt;</em>) is the same as <code>--color=always</code>.
1187         <em>&lt;when&gt;</em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
1188 </p>
1189 </dd>
1190 <dt class="hdlist1">
1191 --no-color
1192 </dt>
1193 <dd>
1194 <p>
1195         Turn off colored diff.
1196         It is the same as <code>--color=never</code>.
1197 </p>
1198 </dd>
1199 <dt class="hdlist1">
1200 --color-moved[=&lt;mode&gt;]
1201 </dt>
1202 <dd>
1203 <p>
1204         Moved lines of code are colored differently.
1205         The &lt;mode&gt; defaults to <em>no</em> if the option is not given
1206         and to <em>zebra</em> if the option with no mode is given.
1207         The mode must be one of:
1208 </p>
1209 <div class="openblock">
1210 <div class="content">
1211 <div class="dlist"><dl>
1212 <dt class="hdlist1">
1213 no
1214 </dt>
1215 <dd>
1216 <p>
1217         Moved lines are not highlighted.
1218 </p>
1219 </dd>
1220 <dt class="hdlist1">
1221 default
1222 </dt>
1223 <dd>
1224 <p>
1225         Is a synonym for <code>zebra</code>. This may change to a more sensible mode
1226         in the future.
1227 </p>
1228 </dd>
1229 <dt class="hdlist1">
1230 plain
1231 </dt>
1232 <dd>
1233 <p>
1234         Any line that is added in one location and was removed
1235         in another location will be colored with <em>color.diff.newMoved</em>.
1236         Similarly <em>color.diff.oldMoved</em> will be used for removed lines
1237         that are added somewhere else in the diff. This mode picks up any
1238         moved line, but it is not very useful in a review to determine
1239         if a block of code was moved without permutation.
1240 </p>
1241 </dd>
1242 <dt class="hdlist1">
1243 blocks
1244 </dt>
1245 <dd>
1246 <p>
1247         Blocks of moved text of at least 20 alphanumeric characters
1248         are detected greedily. The detected blocks are
1249         painted using either the <em>color.diff.{old,new}Moved</em> color.
1250         Adjacent blocks cannot be told apart.
1251 </p>
1252 </dd>
1253 <dt class="hdlist1">
1254 zebra
1255 </dt>
1256 <dd>
1257 <p>
1258         Blocks of moved text are detected as in <em>blocks</em> mode. The blocks
1259         are painted using either the <em>color.diff.{old,new}Moved</em> color or
1260         <em>color.diff.{old,new}MovedAlternative</em>. The change between
1261         the two colors indicates that a new block was detected.
1262 </p>
1263 </dd>
1264 <dt class="hdlist1">
1265 dimmed-zebra
1266 </dt>
1267 <dd>
1268 <p>
1269         Similar to <em>zebra</em>, but additional dimming of uninteresting parts
1270         of moved code is performed. The bordering lines of two adjacent
1271         blocks are considered interesting, the rest is uninteresting.
1272         <code>dimmed_zebra</code> is a deprecated synonym.
1273 </p>
1274 </dd>
1275 </dl></div>
1276 </div></div>
1277 </dd>
1278 <dt class="hdlist1">
1279 --no-color-moved
1280 </dt>
1281 <dd>
1282 <p>
1283         Turn off move detection. This can be used to override configuration
1284         settings. It is the same as <code>--color-moved=no</code>.
1285 </p>
1286 </dd>
1287 <dt class="hdlist1">
1288 --color-moved-ws=&lt;modes&gt;
1289 </dt>
1290 <dd>
1291 <p>
1292         This configures how whitespace is ignored when performing the
1293         move detection for <code>--color-moved</code>.
1294         These modes can be given as a comma separated list:
1295 </p>
1296 <div class="openblock">
1297 <div class="content">
1298 <div class="dlist"><dl>
1299 <dt class="hdlist1">
1300 no
1301 </dt>
1302 <dd>
1303 <p>
1304         Do not ignore whitespace when performing move detection.
1305 </p>
1306 </dd>
1307 <dt class="hdlist1">
1308 ignore-space-at-eol
1309 </dt>
1310 <dd>
1311 <p>
1312         Ignore changes in whitespace at EOL.
1313 </p>
1314 </dd>
1315 <dt class="hdlist1">
1316 ignore-space-change
1317 </dt>
1318 <dd>
1319 <p>
1320         Ignore changes in amount of whitespace.  This ignores whitespace
1321         at line end, and considers all other sequences of one or
1322         more whitespace characters to be equivalent.
1323 </p>
1324 </dd>
1325 <dt class="hdlist1">
1326 ignore-all-space
1327 </dt>
1328 <dd>
1329 <p>
1330         Ignore whitespace when comparing lines. This ignores differences
1331         even if one line has whitespace where the other line has none.
1332 </p>
1333 </dd>
1334 <dt class="hdlist1">
1335 allow-indentation-change
1336 </dt>
1337 <dd>
1338 <p>
1339         Initially ignore any whitespace in the move detection, then
1340         group the moved code blocks only into a block if the change in
1341         whitespace is the same per line. This is incompatible with the
1342         other modes.
1343 </p>
1344 </dd>
1345 </dl></div>
1346 </div></div>
1347 </dd>
1348 <dt class="hdlist1">
1349 --no-color-moved-ws
1350 </dt>
1351 <dd>
1352 <p>
1353         Do not ignore whitespace when performing move detection. This can be
1354         used to override configuration settings. It is the same as
1355         <code>--color-moved-ws=no</code>.
1356 </p>
1357 </dd>
1358 <dt class="hdlist1">
1359 --word-diff[=&lt;mode&gt;]
1360 </dt>
1361 <dd>
1362 <p>
1363         Show a word diff, using the &lt;mode&gt; to delimit changed words.
1364         By default, words are delimited by whitespace; see
1365         <code>--word-diff-regex</code> below.  The &lt;mode&gt; defaults to <em>plain</em>, and
1366         must be one of:
1367 </p>
1368 <div class="openblock">
1369 <div class="content">
1370 <div class="dlist"><dl>
1371 <dt class="hdlist1">
1372 color
1373 </dt>
1374 <dd>
1375 <p>
1376         Highlight changed words using only colors.  Implies <code>--color</code>.
1377 </p>
1378 </dd>
1379 <dt class="hdlist1">
1380 plain
1381 </dt>
1382 <dd>
1383 <p>
1384         Show words as <code>[-removed-]</code> and <code>{+added+}</code>.  Makes no
1385         attempts to escape the delimiters if they appear in the input,
1386         so the output may be ambiguous.
1387 </p>
1388 </dd>
1389 <dt class="hdlist1">
1390 porcelain
1391 </dt>
1392 <dd>
1393 <p>
1394         Use a special line-based format intended for script
1395         consumption.  Added/removed/unchanged runs are printed in the
1396         usual unified diff format, starting with a <code>+</code>/<code>-</code>/` `
1397         character at the beginning of the line and extending to the
1398         end of the line.  Newlines in the input are represented by a
1399         tilde <code>~</code> on a line of its own.
1400 </p>
1401 </dd>
1402 <dt class="hdlist1">
1403 none
1404 </dt>
1405 <dd>
1406 <p>
1407         Disable word diff again.
1408 </p>
1409 </dd>
1410 </dl></div>
1411 </div></div>
1412 <div class="paragraph"><p>Note that despite the name of the first mode, color is used to
1413 highlight the changed parts in all modes if enabled.</p></div>
1414 </dd>
1415 <dt class="hdlist1">
1416 --word-diff-regex=&lt;regex&gt;
1417 </dt>
1418 <dd>
1419 <p>
1420         Use &lt;regex&gt; to decide what a word is, instead of considering
1421         runs of non-whitespace to be a word.  Also implies
1422         <code>--word-diff</code> unless it was already enabled.
1423 </p>
1424 <div class="paragraph"><p>Every non-overlapping match of the
1425 &lt;regex&gt; is considered a word.  Anything between these matches is
1426 considered whitespace and ignored(!) for the purposes of finding
1427 differences.  You may want to append <code>|[^[:space:]]</code> to your regular
1428 expression to make sure that it matches all non-whitespace characters.
1429 A match that contains a newline is silently truncated(!) at the
1430 newline.</p></div>
1431 <div class="paragraph"><p>For example, <code>--word-diff-regex=.</code> will treat each character as a word
1432 and, correspondingly, show differences character by character.</p></div>
1433 <div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
1434 <a href="gitattributes.html">gitattributes(5)</a> or <a href="git-config.html">git-config(1)</a>.  Giving it explicitly
1435 overrides any diff driver or configuration setting.  Diff drivers
1436 override configuration settings.</p></div>
1437 </dd>
1438 <dt class="hdlist1">
1439 --color-words[=&lt;regex&gt;]
1440 </dt>
1441 <dd>
1442 <p>
1443         Equivalent to <code>--word-diff=color</code> plus (if a regex was
1444         specified) <code>--word-diff-regex=&lt;regex&gt;</code>.
1445 </p>
1446 </dd>
1447 <dt class="hdlist1">
1448 --no-renames
1449 </dt>
1450 <dd>
1451 <p>
1452         Turn off rename detection, even when the configuration
1453         file gives the default to do so.
1454 </p>
1455 </dd>
1456 <dt class="hdlist1">
1457 --[no-]rename-empty
1458 </dt>
1459 <dd>
1460 <p>
1461         Whether to use empty blobs as rename source.
1462 </p>
1463 </dd>
1464 <dt class="hdlist1">
1465 --check
1466 </dt>
1467 <dd>
1468 <p>
1469         Warn if changes introduce conflict markers or whitespace errors.
1470         What are considered whitespace errors is controlled by <code>core.whitespace</code>
1471         configuration.  By default, trailing whitespaces (including
1472         lines that consist solely of whitespaces) and a space character
1473         that is immediately followed by a tab character inside the
1474         initial indent of the line are considered whitespace errors.
1475         Exits with non-zero status if problems are found. Not compatible
1476         with --exit-code.
1477 </p>
1478 </dd>
1479 <dt class="hdlist1">
1480 --ws-error-highlight=&lt;kind&gt;
1481 </dt>
1482 <dd>
1483 <p>
1484         Highlight whitespace errors in the <code>context</code>, <code>old</code> or <code>new</code>
1485         lines of the diff.  Multiple values are separated by comma,
1486         <code>none</code> resets previous values, <code>default</code> reset the list to
1487         <code>new</code> and <code>all</code> is a shorthand for <code>old,new,context</code>.  When
1488         this option is not given, and the configuration variable
1489         <code>diff.wsErrorHighlight</code> is not set, only whitespace errors in
1490         <code>new</code> lines are highlighted. The whitespace errors are colored
1491         with <code>color.diff.whitespace</code>.
1492 </p>
1493 </dd>
1494 <dt class="hdlist1">
1495 --full-index
1496 </dt>
1497 <dd>
1498 <p>
1499         Instead of the first handful of characters, show the full
1500         pre- and post-image blob object names on the "index"
1501         line when generating patch format output.
1502 </p>
1503 </dd>
1504 <dt class="hdlist1">
1505 --binary
1506 </dt>
1507 <dd>
1508 <p>
1509         In addition to <code>--full-index</code>, output a binary diff that
1510         can be applied with <code>git-apply</code>.
1511         Implies <code>--patch</code>.
1512 </p>
1513 </dd>
1514 <dt class="hdlist1">
1515 --abbrev[=&lt;n&gt;]
1516 </dt>
1517 <dd>
1518 <p>
1519         Instead of showing the full 40-byte hexadecimal object
1520         name in diff-raw format output and diff-tree header
1521         lines, show the shortest prefix that is at least <em>&lt;n&gt;</em>
1522         hexdigits long that uniquely refers the object.
1523         In diff-patch output format, <code>--full-index</code> takes higher
1524         precedence, i.e. if <code>--full-index</code> is specified, full blob
1525         names will be shown regardless of <code>--abbrev</code>.
1526         Non default number of digits can be specified with <code>--abbrev=&lt;n&gt;</code>.
1527 </p>
1528 </dd>
1529 <dt class="hdlist1">
1530 -B[&lt;n&gt;][/&lt;m&gt;]
1531 </dt>
1532 <dt class="hdlist1">
1533 --break-rewrites[=[&lt;n&gt;][/&lt;m&gt;]]
1534 </dt>
1535 <dd>
1536 <p>
1537         Break complete rewrite changes into pairs of delete and
1538         create. This serves two purposes:
1539 </p>
1540 <div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
1541 not as a series of deletion and insertion mixed together with a very
1542 few lines that happen to match textually as the context, but as a
1543 single deletion of everything old followed by a single insertion of
1544 everything new, and the number <code>m</code> controls this aspect of the -B
1545 option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
1546 original should remain in the result for Git to consider it a total
1547 rewrite (i.e. otherwise the resulting patch will be a series of
1548 deletion and insertion mixed together with context lines).</p></div>
1549 <div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
1550 source of a rename (usually -M only considers a file that disappeared
1551 as the source of a rename), and the number <code>n</code> controls this aspect of
1552 the -B option (defaults to 50%). <code>-B20%</code> specifies that a change with
1553 addition and deletion compared to 20% or more of the file&#8217;s size are
1554 eligible for being picked up as a possible source of a rename to
1555 another file.</p></div>
1556 </dd>
1557 <dt class="hdlist1">
1558 -M[&lt;n&gt;]
1559 </dt>
1560 <dt class="hdlist1">
1561 --find-renames[=&lt;n&gt;]
1562 </dt>
1563 <dd>
1564 <p>
1565         Detect renames.
1566         If <code>n</code> is specified, it is a threshold on the similarity
1567         index (i.e. amount of addition/deletions compared to the
1568         file&#8217;s size). For example, <code>-M90%</code> means Git should consider a
1569         delete/add pair to be a rename if more than 90% of the file
1570         hasn&#8217;t changed.  Without a <code>%</code> sign, the number is to be read as
1571         a fraction, with a decimal point before it.  I.e., <code>-M5</code> becomes
1572         0.5, and is thus the same as <code>-M50%</code>.  Similarly, <code>-M05</code> is
1573         the same as <code>-M5%</code>.  To limit detection to exact renames, use
1574         <code>-M100%</code>.  The default similarity index is 50%.
1575 </p>
1576 </dd>
1577 <dt class="hdlist1">
1578 -C[&lt;n&gt;]
1579 </dt>
1580 <dt class="hdlist1">
1581 --find-copies[=&lt;n&gt;]
1582 </dt>
1583 <dd>
1584 <p>
1585         Detect copies as well as renames.  See also <code>--find-copies-harder</code>.
1586         If <code>n</code> is specified, it has the same meaning as for <code>-M&lt;n&gt;</code>.
1587 </p>
1588 </dd>
1589 <dt class="hdlist1">
1590 --find-copies-harder
1591 </dt>
1592 <dd>
1593 <p>
1594         For performance reasons, by default, <code>-C</code> option finds copies only
1595         if the original file of the copy was modified in the same
1596         changeset.  This flag makes the command
1597         inspect unmodified files as candidates for the source of
1598         copy.  This is a very expensive operation for large
1599         projects, so use it with caution.  Giving more than one
1600         <code>-C</code> option has the same effect.
1601 </p>
1602 </dd>
1603 <dt class="hdlist1">
1604 -D
1605 </dt>
1606 <dt class="hdlist1">
1607 --irreversible-delete
1608 </dt>
1609 <dd>
1610 <p>
1611         Omit the preimage for deletes, i.e. print only the header but not
1612         the diff between the preimage and <code>/dev/null</code>. The resulting patch
1613         is not meant to be applied with <code>patch</code> or <code>git apply</code>; this is
1614         solely for people who want to just concentrate on reviewing the
1615         text after the change. In addition, the output obviously lacks
1616         enough information to apply such a patch in reverse, even manually,
1617         hence the name of the option.
1618 </p>
1619 <div class="paragraph"><p>When used together with <code>-B</code>, omit also the preimage in the deletion part
1620 of a delete/create pair.</p></div>
1621 </dd>
1622 <dt class="hdlist1">
1623 -l&lt;num&gt;
1624 </dt>
1625 <dd>
1626 <p>
1627         The <code>-M</code> and <code>-C</code> options involve some preliminary steps that
1628         can detect subsets of renames/copies cheaply, followed by an
1629         exhaustive fallback portion that compares all remaining
1630         unpaired destinations to all relevant sources.  (For renames,
1631         only remaining unpaired sources are relevant; for copies, all
1632         original sources are relevant.)  For N sources and
1633         destinations, this exhaustive check is O(N^2).  This option
1634         prevents the exhaustive portion of rename/copy detection from
1635         running if the number of source/destination files involved
1636         exceeds the specified number.  Defaults to diff.renameLimit.
1637         Note that a value of 0 is treated as unlimited.
1638 </p>
1639 </dd>
1640 <dt class="hdlist1">
1641 --diff-filter=[(A|C|D|M|R|T|U|X|B)&#8230;[*]]
1642 </dt>
1643 <dd>
1644 <p>
1645         Select only files that are Added (<code>A</code>), Copied (<code>C</code>),
1646         Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their
1647         type (i.e. regular file, symlink, submodule, &#8230;) changed (<code>T</code>),
1648         are Unmerged (<code>U</code>), are
1649         Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>).
1650         Any combination of the filter characters (including none) can be used.
1651         When <code>*</code> (All-or-none) is added to the combination, all
1652         paths are selected if there is any file that matches
1653         other criteria in the comparison; if there is no file
1654         that matches other criteria, nothing is selected.
1655 </p>
1656 <div class="paragraph"><p>Also, these upper-case letters can be downcased to exclude.  E.g.
1657 <code>--diff-filter=ad</code> excludes added and deleted paths.</p></div>
1658 <div class="paragraph"><p>Note that not all diffs can feature all types. For instance, copied and
1659 renamed entries cannot appear if detection for those types is disabled.</p></div>
1660 </dd>
1661 <dt class="hdlist1">
1662 -S&lt;string&gt;
1663 </dt>
1664 <dd>
1665 <p>
1666         Look for differences that change the number of occurrences of
1667         the specified string (i.e. addition/deletion) in a file.
1668         Intended for the scripter&#8217;s use.
1669 </p>
1670 <div class="paragraph"><p>It is useful when you&#8217;re looking for an exact block of code (like a
1671 struct), and want to know the history of that block since it first
1672 came into being: use the feature iteratively to feed the interesting
1673 block in the preimage back into <code>-S</code>, and keep going until you get the
1674 very first version of the block.</p></div>
1675 <div class="paragraph"><p>Binary files are searched as well.</p></div>
1676 </dd>
1677 <dt class="hdlist1">
1678 -G&lt;regex&gt;
1679 </dt>
1680 <dd>
1681 <p>
1682         Look for differences whose patch text contains added/removed
1683         lines that match &lt;regex&gt;.
1684 </p>
1685 <div class="paragraph"><p>To illustrate the difference between <code>-S&lt;regex&gt; --pickaxe-regex</code> and
1686 <code>-G&lt;regex&gt;</code>, consider a commit with the following diff in the same
1687 file:</p></div>
1688 <div class="listingblock">
1689 <div class="content">
1690 <pre><code>+    return frotz(nitfol, two-&gt;ptr, 1, 0);
1691 ...
1692 -    hit = frotz(nitfol, mf2.ptr, 1, 0);</code></pre>
1693 </div></div>
1694 <div class="paragraph"><p>While <code>git log -G"frotz\(nitfol"</code> will show this commit, <code>git log
1695 -S"frotz\(nitfol" --pickaxe-regex</code> will not (because the number of
1696 occurrences of that string did not change).</p></div>
1697 <div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
1698 filter will be ignored.</p></div>
1699 <div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
1700 information.</p></div>
1701 </dd>
1702 <dt class="hdlist1">
1703 --find-object=&lt;object-id&gt;
1704 </dt>
1705 <dd>
1706 <p>
1707         Look for differences that change the number of occurrences of
1708         the specified object. Similar to <code>-S</code>, just the argument is different
1709         in that it doesn&#8217;t search for a specific string but for a specific
1710         object id.
1711 </p>
1712 <div class="paragraph"><p>The object can be a blob or a submodule commit. It implies the <code>-t</code> option in
1713 <code>git-log</code> to also find trees.</p></div>
1714 </dd>
1715 <dt class="hdlist1">
1716 --pickaxe-all
1717 </dt>
1718 <dd>
1719 <p>
1720         When <code>-S</code> or <code>-G</code> finds a change, show all the changes in that
1721         changeset, not just the files that contain the change
1722         in &lt;string&gt;.
1723 </p>
1724 </dd>
1725 <dt class="hdlist1">
1726 --pickaxe-regex
1727 </dt>
1728 <dd>
1729 <p>
1730         Treat the &lt;string&gt; given to <code>-S</code> as an extended POSIX regular
1731         expression to match.
1732 </p>
1733 </dd>
1734 <dt class="hdlist1">
1735 -O&lt;orderfile&gt;
1736 </dt>
1737 <dd>
1738 <p>
1739         Control the order in which files appear in the output.
1740         This overrides the <code>diff.orderFile</code> configuration variable
1741         (see <a href="git-config.html">git-config(1)</a>).  To cancel <code>diff.orderFile</code>,
1742         use <code>-O/dev/null</code>.
1743 </p>
1744 <div class="paragraph"><p>The output order is determined by the order of glob patterns in
1745 &lt;orderfile&gt;.
1746 All files with pathnames that match the first pattern are output
1747 first, all files with pathnames that match the second pattern (but not
1748 the first) are output next, and so on.
1749 All files with pathnames that do not match any pattern are output
1750 last, as if there was an implicit match-all pattern at the end of the
1751 file.
1752 If multiple pathnames have the same rank (they match the same pattern
1753 but no earlier patterns), their output order relative to each other is
1754 the normal order.</p></div>
1755 <div class="paragraph"><p>&lt;orderfile&gt; is parsed as follows:</p></div>
1756 <div class="openblock">
1757 <div class="content">
1758 <div class="ulist"><ul>
1759 <li>
1760 <p>
1761 Blank lines are ignored, so they can be used as separators for
1762    readability.
1763 </p>
1764 </li>
1765 <li>
1766 <p>
1767 Lines starting with a hash ("<code>#</code>") are ignored, so they can be used
1768    for comments.  Add a backslash ("<code>\</code>") to the beginning of the
1769    pattern if it starts with a hash.
1770 </p>
1771 </li>
1772 <li>
1773 <p>
1774 Each other line contains a single pattern.
1775 </p>
1776 </li>
1777 </ul></div>
1778 </div></div>
1779 <div class="paragraph"><p>Patterns have the same syntax and semantics as patterns used for
1780 fnmatch(3) without the FNM_PATHNAME flag, except a pathname also
1781 matches a pattern if removing any number of the final pathname
1782 components matches the pattern.  For example, the pattern "<code>foo*bar</code>"
1783 matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div>
1784 </dd>
1785 <dt class="hdlist1">
1786 --skip-to=&lt;file&gt;
1787 </dt>
1788 <dt class="hdlist1">
1789 --rotate-to=&lt;file&gt;
1790 </dt>
1791 <dd>
1792 <p>
1793         Discard the files before the named &lt;file&gt; from the output
1794         (i.e. <em>skip to</em>), or move them to the end of the output
1795         (i.e. <em>rotate to</em>).  These were invented primarily for use
1796         of the <code>git difftool</code> command, and may not be very useful
1797         otherwise.
1798 </p>
1799 </dd>
1800 <dt class="hdlist1">
1801 -R
1802 </dt>
1803 <dd>
1804 <p>
1805         Swap two inputs; that is, show differences from index or
1806         on-disk file to tree contents.
1807 </p>
1808 </dd>
1809 <dt class="hdlist1">
1810 --relative[=&lt;path&gt;]
1811 </dt>
1812 <dt class="hdlist1">
1813 --no-relative
1814 </dt>
1815 <dd>
1816 <p>
1817         When run from a subdirectory of the project, it can be
1818         told to exclude changes outside the directory and show
1819         pathnames relative to it with this option.  When you are
1820         not in a subdirectory (e.g. in a bare repository), you
1821         can name which subdirectory to make the output relative
1822         to by giving a &lt;path&gt; as an argument.
1823         <code>--no-relative</code> can be used to countermand both <code>diff.relative</code> config
1824         option and previous <code>--relative</code>.
1825 </p>
1826 </dd>
1827 <dt class="hdlist1">
1828 -a
1829 </dt>
1830 <dt class="hdlist1">
1831 --text
1832 </dt>
1833 <dd>
1834 <p>
1835         Treat all files as text.
1836 </p>
1837 </dd>
1838 <dt class="hdlist1">
1839 --ignore-cr-at-eol
1840 </dt>
1841 <dd>
1842 <p>
1843         Ignore carriage-return at the end of line when doing a comparison.
1844 </p>
1845 </dd>
1846 <dt class="hdlist1">
1847 --ignore-space-at-eol
1848 </dt>
1849 <dd>
1850 <p>
1851         Ignore changes in whitespace at EOL.
1852 </p>
1853 </dd>
1854 <dt class="hdlist1">
1855 -b
1856 </dt>
1857 <dt class="hdlist1">
1858 --ignore-space-change
1859 </dt>
1860 <dd>
1861 <p>
1862         Ignore changes in amount of whitespace.  This ignores whitespace
1863         at line end, and considers all other sequences of one or
1864         more whitespace characters to be equivalent.
1865 </p>
1866 </dd>
1867 <dt class="hdlist1">
1868 -w
1869 </dt>
1870 <dt class="hdlist1">
1871 --ignore-all-space
1872 </dt>
1873 <dd>
1874 <p>
1875         Ignore whitespace when comparing lines.  This ignores
1876         differences even if one line has whitespace where the other
1877         line has none.
1878 </p>
1879 </dd>
1880 <dt class="hdlist1">
1881 --ignore-blank-lines
1882 </dt>
1883 <dd>
1884 <p>
1885         Ignore changes whose lines are all blank.
1886 </p>
1887 </dd>
1888 <dt class="hdlist1">
1889 -I&lt;regex&gt;
1890 </dt>
1891 <dt class="hdlist1">
1892 --ignore-matching-lines=&lt;regex&gt;
1893 </dt>
1894 <dd>
1895 <p>
1896         Ignore changes whose all lines match &lt;regex&gt;.  This option may
1897         be specified more than once.
1898 </p>
1899 </dd>
1900 <dt class="hdlist1">
1901 --inter-hunk-context=&lt;lines&gt;
1902 </dt>
1903 <dd>
1904 <p>
1905         Show the context between diff hunks, up to the specified number
1906         of lines, thereby fusing hunks that are close to each other.
1907         Defaults to <code>diff.interHunkContext</code> or 0 if the config option
1908         is unset.
1909 </p>
1910 </dd>
1911 <dt class="hdlist1">
1912 -W
1913 </dt>
1914 <dt class="hdlist1">
1915 --function-context
1916 </dt>
1917 <dd>
1918 <p>
1919         Show whole function as context lines for each change.
1920         The function names are determined in the same way as
1921         <code>git diff</code> works out patch hunk headers (see <em>Defining a
1922         custom hunk-header</em> in <a href="gitattributes.html">gitattributes(5)</a>).
1923 </p>
1924 </dd>
1925 <dt class="hdlist1">
1926 --exit-code
1927 </dt>
1928 <dd>
1929 <p>
1930         Make the program exit with codes similar to diff(1).
1931         That is, it exits with 1 if there were differences and
1932         0 means no differences.
1933 </p>
1934 </dd>
1935 <dt class="hdlist1">
1936 --quiet
1937 </dt>
1938 <dd>
1939 <p>
1940         Disable all output of the program. Implies <code>--exit-code</code>.
1941 </p>
1942 </dd>
1943 <dt class="hdlist1">
1944 --ext-diff
1945 </dt>
1946 <dd>
1947 <p>
1948         Allow an external diff helper to be executed. If you set an
1949         external diff driver with <a href="gitattributes.html">gitattributes(5)</a>, you need
1950         to use this option with <a href="git-log.html">git-log(1)</a> and friends.
1951 </p>
1952 </dd>
1953 <dt class="hdlist1">
1954 --no-ext-diff
1955 </dt>
1956 <dd>
1957 <p>
1958         Disallow external diff drivers.
1959 </p>
1960 </dd>
1961 <dt class="hdlist1">
1962 --textconv
1963 </dt>
1964 <dt class="hdlist1">
1965 --no-textconv
1966 </dt>
1967 <dd>
1968 <p>
1969         Allow (or disallow) external text conversion filters to be run
1970         when comparing binary files. See <a href="gitattributes.html">gitattributes(5)</a> for
1971         details. Because textconv filters are typically a one-way
1972         conversion, the resulting diff is suitable for human
1973         consumption, but cannot be applied. For this reason, textconv
1974         filters are enabled by default only for <a href="git-diff.html">git-diff(1)</a> and
1975         <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or
1976         diff plumbing commands.
1977 </p>
1978 </dd>
1979 <dt class="hdlist1">
1980 --ignore-submodules[=&lt;when&gt;]
1981 </dt>
1982 <dd>
1983 <p>
1984         Ignore changes to submodules in the diff generation. &lt;when&gt; can be
1985         either "none", "untracked", "dirty" or "all", which is the default.
1986         Using "none" will consider the submodule modified when it either contains
1987         untracked or modified files or its HEAD differs from the commit recorded
1988         in the superproject and can be used to override any settings of the
1989         <em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When
1990         "untracked" is used submodules are not considered dirty when they only
1991         contain untracked content (but they are still scanned for modified
1992         content). Using "dirty" ignores all changes to the work tree of submodules,
1993         only changes to the commits stored in the superproject are shown (this was
1994         the behavior until 1.7.0). Using "all" hides all changes to submodules.
1995 </p>
1996 </dd>
1997 <dt class="hdlist1">
1998 --src-prefix=&lt;prefix&gt;
1999 </dt>
2000 <dd>
2001 <p>
2002         Show the given source prefix instead of "a/".
2003 </p>
2004 </dd>
2005 <dt class="hdlist1">
2006 --dst-prefix=&lt;prefix&gt;
2007 </dt>
2008 <dd>
2009 <p>
2010         Show the given destination prefix instead of "b/".
2011 </p>
2012 </dd>
2013 <dt class="hdlist1">
2014 --no-prefix
2015 </dt>
2016 <dd>
2017 <p>
2018         Do not show any source or destination prefix.
2019 </p>
2020 </dd>
2021 <dt class="hdlist1">
2022 --default-prefix
2023 </dt>
2024 <dd>
2025 <p>
2026         Use the default source and destination prefixes ("a/" and "b/").
2027         This is usually the default already, but may be used to override
2028         config such as <code>diff.noprefix</code>.
2029 </p>
2030 </dd>
2031 <dt class="hdlist1">
2032 --line-prefix=&lt;prefix&gt;
2033 </dt>
2034 <dd>
2035 <p>
2036         Prepend an additional prefix to every line of output.
2037 </p>
2038 </dd>
2039 <dt class="hdlist1">
2040 --ita-invisible-in-index
2041 </dt>
2042 <dd>
2043 <p>
2044         By default entries added by "git add -N" appear as an existing
2045         empty file in "git diff" and a new file in "git diff --cached".
2046         This option makes the entry appear as a new file in "git diff"
2047         and non-existent in "git diff --cached". This option could be
2048         reverted with <code>--ita-visible-in-index</code>. Both options are
2049         experimental and could be removed in future.
2050 </p>
2051 </dd>
2052 </dl></div>
2053 <div class="paragraph"><p>For more detailed explanation on these common options, see also
2054 <a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>
2055 <div class="dlist"><dl>
2056 <dt class="hdlist1">
2057 &lt;tree-ish&gt;
2058 </dt>
2059 <dd>
2060 <p>
2061         The id of a tree object.
2062 </p>
2063 </dd>
2064 <dt class="hdlist1">
2065 &lt;path&gt;&#8230;
2066 </dt>
2067 <dd>
2068 <p>
2069         If provided, the results are limited to a subset of files
2070         matching one of the provided pathspecs.
2071 </p>
2072 </dd>
2073 <dt class="hdlist1">
2074 -r
2075 </dt>
2076 <dd>
2077 <p>
2078         recurse into sub-trees
2079 </p>
2080 </dd>
2081 <dt class="hdlist1">
2082 -t
2083 </dt>
2084 <dd>
2085 <p>
2086         show tree entry itself as well as subtrees.  Implies -r.
2087 </p>
2088 </dd>
2089 <dt class="hdlist1">
2090 --root
2091 </dt>
2092 <dd>
2093 <p>
2094         When <code>--root</code> is specified the initial commit will be shown as a big
2095         creation event. This is equivalent to a diff against the NULL tree.
2096 </p>
2097 </dd>
2098 <dt class="hdlist1">
2099 --merge-base
2100 </dt>
2101 <dd>
2102 <p>
2103         Instead of comparing the &lt;tree-ish&gt;s directly, use the merge
2104         base between the two &lt;tree-ish&gt;s as the "before" side.  There
2105         must be two &lt;tree-ish&gt;s given and they must both be commits.
2106 </p>
2107 </dd>
2108 <dt class="hdlist1">
2109 --stdin
2110 </dt>
2111 <dd>
2112 <p>
2113         When <code>--stdin</code> is specified, the command does not take
2114         &lt;tree-ish&gt; arguments from the command line.  Instead, it
2115         reads lines containing either two &lt;tree&gt;, one &lt;commit&gt;, or a
2116         list of &lt;commit&gt; from its standard input.  (Use a single space
2117         as separator.)
2118 </p>
2119 <div class="paragraph"><p>When two trees are given, it compares the first tree with the second.
2120 When a single commit is given, it compares the commit with its
2121 parents.  The remaining commits, when given, are used as if they are
2122 parents of the first commit.</p></div>
2123 <div class="paragraph"><p>When comparing two trees, the ID of both trees (separated by a space
2124 and terminated by a newline) is printed before the difference.  When
2125 comparing commits, the ID of the first (or only) commit, followed by a
2126 newline, is printed.</p></div>
2127 <div class="paragraph"><p>The following flags further affect the behavior when comparing
2128 commits (but not trees).</p></div>
2129 </dd>
2130 <dt class="hdlist1">
2131 -m
2132 </dt>
2133 <dd>
2134 <p>
2135         By default, <em>git diff-tree --stdin</em> does not show
2136         differences for merge commits.  With this flag, it shows
2137         differences to that commit from all of its parents. See
2138         also <code>-c</code>.
2139 </p>
2140 </dd>
2141 <dt class="hdlist1">
2142 -s
2143 </dt>
2144 <dd>
2145 <p>
2146         By default, <em>git diff-tree --stdin</em> shows differences,
2147         either in machine-readable form (without <code>-p</code>) or in patch
2148         form (with <code>-p</code>).  This output can be suppressed.  It is
2149         only useful with <code>-v</code> flag.
2150 </p>
2151 </dd>
2152 <dt class="hdlist1">
2153 -v
2154 </dt>
2155 <dd>
2156 <p>
2157         This flag causes <em>git diff-tree --stdin</em> to also show
2158         the commit message before the differences.
2159 </p>
2160 </dd>
2161 <dt class="hdlist1">
2162 --pretty[=&lt;format&gt;]
2163 </dt>
2164 <dt class="hdlist1">
2165 --format=&lt;format&gt;
2166 </dt>
2167 <dd>
2168 <p>
2169         Pretty-print the contents of the commit logs in a given format,
2170         where <em>&lt;format&gt;</em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,
2171         <em>full</em>, <em>fuller</em>, <em>reference</em>, <em>email</em>, <em>raw</em>, <em>format:&lt;string&gt;</em>
2172         and <em>tformat:&lt;string&gt;</em>.  When <em>&lt;format&gt;</em> is none of the above,
2173         and has <em>%placeholder</em> in it, it acts as if
2174         <em>--pretty=tformat:&lt;format&gt;</em> were given.
2175 </p>
2176 <div class="paragraph"><p>See the "PRETTY FORMATS" section for some additional details for each
2177 format.  When <em>=&lt;format&gt;</em> part is omitted, it defaults to <em>medium</em>.</p></div>
2178 <div class="paragraph"><p>Note: you can specify the default pretty format in the repository
2179 configuration (see <a href="git-config.html">git-config(1)</a>).</p></div>
2180 </dd>
2181 <dt class="hdlist1">
2182 --abbrev-commit
2183 </dt>
2184 <dd>
2185 <p>
2186         Instead of showing the full 40-byte hexadecimal commit object
2187         name, show a prefix that names the object uniquely.
2188         "--abbrev=&lt;n&gt;" (which also modifies diff output, if it is displayed)
2189         option can be used to specify the minimum length of the prefix.
2190 </p>
2191 <div class="paragraph"><p>This should make "--pretty=oneline" a whole lot more readable for
2192 people using 80-column terminals.</p></div>
2193 </dd>
2194 <dt class="hdlist1">
2195 --no-abbrev-commit
2196 </dt>
2197 <dd>
2198 <p>
2199         Show the full 40-byte hexadecimal commit object name. This negates
2200         <code>--abbrev-commit</code>, either explicit or implied by other options such
2201         as "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.
2202 </p>
2203 </dd>
2204 <dt class="hdlist1">
2205 --oneline
2206 </dt>
2207 <dd>
2208 <p>
2209         This is a shorthand for "--pretty=oneline --abbrev-commit"
2210         used together.
2211 </p>
2212 </dd>
2213 <dt class="hdlist1">
2214 --encoding=&lt;encoding&gt;
2215 </dt>
2216 <dd>
2217 <p>
2218         Commit objects record the character encoding used for the log message
2219         in their encoding header; this option can be used to tell the
2220         command to re-code the commit log message in the encoding
2221         preferred by the user.  For non plumbing commands this
2222         defaults to UTF-8. Note that if an object claims to be encoded
2223         in <code>X</code> and we are outputting in <code>X</code>, we will output the object
2224         verbatim; this means that invalid sequences in the original
2225         commit may be copied to the output. Likewise, if iconv(3) fails
2226         to convert the commit, we will quietly output the original
2227         object verbatim.
2228 </p>
2229 </dd>
2230 <dt class="hdlist1">
2231 --expand-tabs=&lt;n&gt;
2232 </dt>
2233 <dt class="hdlist1">
2234 --expand-tabs
2235 </dt>
2236 <dt class="hdlist1">
2237 --no-expand-tabs
2238 </dt>
2239 <dd>
2240 <p>
2241         Perform a tab expansion (replace each tab with enough spaces
2242         to fill to the next display column that is multiple of <em>&lt;n&gt;</em>)
2243         in the log message before showing it in the output.
2244         <code>--expand-tabs</code> is a short-hand for <code>--expand-tabs=8</code>, and
2245         <code>--no-expand-tabs</code> is a short-hand for <code>--expand-tabs=0</code>,
2246         which disables tab expansion.
2247 </p>
2248 <div class="paragraph"><p>By default, tabs are expanded in pretty formats that indent the log
2249 message by 4 spaces (i.e.  <em>medium</em>, which is the default, <em>full</em>,
2250 and <em>fuller</em>).</p></div>
2251 </dd>
2252 <dt class="hdlist1">
2253 --notes[=&lt;ref&gt;]
2254 </dt>
2255 <dd>
2256 <p>
2257         Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the
2258         commit, when showing the commit log message.  This is the default
2259         for <code>git log</code>, <code>git show</code> and <code>git whatchanged</code> commands when
2260         there is no <code>--pretty</code>, <code>--format</code>, or <code>--oneline</code> option given
2261         on the command line.
2262 </p>
2263 <div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the
2264 <code>core.notesRef</code> and <code>notes.displayRef</code> variables (or corresponding
2265 environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
2266 <div class="paragraph"><p>With an optional <em>&lt;ref&gt;</em> argument, use the ref to find the notes
2267 to display.  The ref can specify the full refname when it begins
2268 with <code>refs/notes/</code>; when it begins with <code>notes/</code>, <code>refs/</code> and otherwise
2269 <code>refs/notes/</code> is prefixed to form a full name of the ref.</p></div>
2270 <div class="paragraph"><p>Multiple --notes options can be combined to control which notes are
2271 being displayed. Examples: "--notes=foo" will show only notes from
2272 "refs/notes/foo"; "--notes=foo --notes" will show both notes from
2273 "refs/notes/foo" and from the default notes ref(s).</p></div>
2274 </dd>
2275 <dt class="hdlist1">
2276 --no-notes
2277 </dt>
2278 <dd>
2279 <p>
2280         Do not show notes. This negates the above <code>--notes</code> option, by
2281         resetting the list of notes refs from which notes are shown.
2282         Options are parsed in the order given on the command line, so e.g.
2283         "--notes --notes=foo --no-notes --notes=bar" will only show notes
2284         from "refs/notes/bar".
2285 </p>
2286 </dd>
2287 <dt class="hdlist1">
2288 --show-notes[=&lt;ref&gt;]
2289 </dt>
2290 <dt class="hdlist1">
2291 --[no-]standard-notes
2292 </dt>
2293 <dd>
2294 <p>
2295         These options are deprecated. Use the above --notes/--no-notes
2296         options instead.
2297 </p>
2298 </dd>
2299 <dt class="hdlist1">
2300 --show-signature
2301 </dt>
2302 <dd>
2303 <p>
2304         Check the validity of a signed commit object by passing the signature
2305         to <code>gpg --verify</code> and show the output.
2306 </p>
2307 </dd>
2308 <dt class="hdlist1">
2309 --no-commit-id
2310 </dt>
2311 <dd>
2312 <p>
2313         <em>git diff-tree</em> outputs a line with the commit ID when
2314         applicable.  This flag suppressed the commit ID output.
2315 </p>
2316 </dd>
2317 <dt class="hdlist1">
2318 -c
2319 </dt>
2320 <dd>
2321 <p>
2322         This flag changes the way a merge commit is displayed
2323         (which means it is useful only when the command is given
2324         one &lt;tree-ish&gt;, or <code>--stdin</code>).  It shows the differences
2325         from each of the parents to the merge result simultaneously
2326         instead of showing pairwise diff between a parent and the
2327         result one at a time (which is what the <code>-m</code> option does).
2328         Furthermore, it lists only files which were modified
2329         from all parents.
2330 </p>
2331 </dd>
2332 <dt class="hdlist1">
2333 --cc
2334 </dt>
2335 <dd>
2336 <p>
2337         This flag changes the way a merge commit patch is displayed,
2338         in a similar way to the <code>-c</code> option. It implies the <code>-c</code>
2339         and <code>-p</code> options and further compresses the patch output
2340         by omitting uninteresting hunks whose the contents in the parents
2341         have only two variants and the merge result picks one of them
2342         without modification.  When all hunks are uninteresting, the commit
2343         itself and the commit log message is not shown, just like in any other
2344         "empty diff" case.
2345 </p>
2346 </dd>
2347 <dt class="hdlist1">
2348 --combined-all-paths
2349 </dt>
2350 <dd>
2351 <p>
2352         This flag causes combined diffs (used for merge commits) to
2353         list the name of the file from all parents.  It thus only has
2354         effect when -c or --cc are specified, and is likely only
2355         useful if filename changes are detected (i.e. when either
2356         rename or copy detection have been requested).
2357 </p>
2358 </dd>
2359 <dt class="hdlist1">
2360 --always
2361 </dt>
2362 <dd>
2363 <p>
2364         Show the commit itself and the commit log message even
2365         if the diff itself is empty.
2366 </p>
2367 </dd>
2368 </dl></div>
2369 </div>
2370 </div>
2371 <div class="sect1">
2372 <h2 id="_pretty_formats">PRETTY FORMATS</h2>
2373 <div class="sectionbody">
2374 <div class="paragraph"><p>If the commit is a merge, and if the pretty-format
2375 is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
2376 inserted before the <em>Author:</em> line.  This line begins with
2377 "Merge: " and the hashes of ancestral commits are printed,
2378 separated by spaces.  Note that the listed commits may not
2379 necessarily be the list of the <strong>direct</strong> parent commits if you
2380 have limited your view of history: for example, if you are
2381 only interested in changes related to a certain directory or
2382 file.</p></div>
2383 <div class="paragraph"><p>There are several built-in formats, and you can define
2384 additional formats by setting a pretty.&lt;name&gt;
2385 config option to either another format name, or a
2386 <em>format:</em> string, as described below (see
2387 <a href="git-config.html">git-config(1)</a>). Here are the details of the
2388 built-in formats:</p></div>
2389 <div class="ulist"><ul>
2390 <li>
2391 <p>
2392 <em>oneline</em>
2393 </p>
2394 <div class="literalblock">
2395 <div class="content">
2396 <pre><code>&lt;hash&gt; &lt;title-line&gt;</code></pre>
2397 </div></div>
2398 <div class="paragraph"><p>This is designed to be as compact as possible.</p></div>
2399 </li>
2400 <li>
2401 <p>
2402 <em>short</em>
2403 </p>
2404 <div class="literalblock">
2405 <div class="content">
2406 <pre><code>commit &lt;hash&gt;
2407 Author: &lt;author&gt;</code></pre>
2408 </div></div>
2409 <div class="literalblock">
2410 <div class="content">
2411 <pre><code>&lt;title-line&gt;</code></pre>
2412 </div></div>
2413 </li>
2414 <li>
2415 <p>
2416 <em>medium</em>
2417 </p>
2418 <div class="literalblock">
2419 <div class="content">
2420 <pre><code>commit &lt;hash&gt;
2421 Author: &lt;author&gt;
2422 Date:   &lt;author-date&gt;</code></pre>
2423 </div></div>
2424 <div class="literalblock">
2425 <div class="content">
2426 <pre><code>&lt;title-line&gt;</code></pre>
2427 </div></div>
2428 <div class="literalblock">
2429 <div class="content">
2430 <pre><code>&lt;full-commit-message&gt;</code></pre>
2431 </div></div>
2432 </li>
2433 <li>
2434 <p>
2435 <em>full</em>
2436 </p>
2437 <div class="literalblock">
2438 <div class="content">
2439 <pre><code>commit &lt;hash&gt;
2440 Author: &lt;author&gt;
2441 Commit: &lt;committer&gt;</code></pre>
2442 </div></div>
2443 <div class="literalblock">
2444 <div class="content">
2445 <pre><code>&lt;title-line&gt;</code></pre>
2446 </div></div>
2447 <div class="literalblock">
2448 <div class="content">
2449 <pre><code>&lt;full-commit-message&gt;</code></pre>
2450 </div></div>
2451 </li>
2452 <li>
2453 <p>
2454 <em>fuller</em>
2455 </p>
2456 <div class="literalblock">
2457 <div class="content">
2458 <pre><code>commit &lt;hash&gt;
2459 Author:     &lt;author&gt;
2460 AuthorDate: &lt;author-date&gt;
2461 Commit:     &lt;committer&gt;
2462 CommitDate: &lt;committer-date&gt;</code></pre>
2463 </div></div>
2464 <div class="literalblock">
2465 <div class="content">
2466 <pre><code>&lt;title-line&gt;</code></pre>
2467 </div></div>
2468 <div class="literalblock">
2469 <div class="content">
2470 <pre><code>&lt;full-commit-message&gt;</code></pre>
2471 </div></div>
2472 </li>
2473 <li>
2474 <p>
2475 <em>reference</em>
2476 </p>
2477 <div class="literalblock">
2478 <div class="content">
2479 <pre><code>&lt;abbrev-hash&gt; (&lt;title-line&gt;, &lt;short-author-date&gt;)</code></pre>
2480 </div></div>
2481 <div class="paragraph"><p>This format is used to refer to another commit in a commit message and
2482 is the same as <code>--pretty='format:%C(auto)%h (%s, %ad)'</code>.  By default,
2483 the date is formatted with <code>--date=short</code> unless another <code>--date</code> option
2484 is explicitly specified.  As with any <code>format:</code> with format
2485 placeholders, its output is not affected by other options like
2486 <code>--decorate</code> and <code>--walk-reflogs</code>.</p></div>
2487 </li>
2488 <li>
2489 <p>
2490 <em>email</em>
2491 </p>
2492 <div class="literalblock">
2493 <div class="content">
2494 <pre><code>From &lt;hash&gt; &lt;date&gt;
2495 From: &lt;author&gt;
2496 Date: &lt;author-date&gt;
2497 Subject: [PATCH] &lt;title-line&gt;</code></pre>
2498 </div></div>
2499 <div class="literalblock">
2500 <div class="content">
2501 <pre><code>&lt;full-commit-message&gt;</code></pre>
2502 </div></div>
2503 </li>
2504 <li>
2505 <p>
2506 <em>mboxrd</em>
2507 </p>
2508 <div class="paragraph"><p>Like <em>email</em>, but lines in the commit message starting with "From "
2509 (preceded by zero or more "&gt;") are quoted with "&gt;" so they aren&#8217;t
2510 confused as starting a new commit.</p></div>
2511 </li>
2512 <li>
2513 <p>
2514 <em>raw</em>
2515 </p>
2516 <div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as
2517 stored in the commit object.  Notably, the hashes are
2518 displayed in full, regardless of whether --abbrev or
2519 --no-abbrev are used, and <em>parents</em> information show the
2520 true parent commits, without taking grafts or history
2521 simplification into account. Note that this format affects the way
2522 commits are displayed, but not the way the diff is shown e.g. with
2523 <code>git log --raw</code>. To get full object names in a raw diff format,
2524 use <code>--no-abbrev</code>.</p></div>
2525 </li>
2526 <li>
2527 <p>
2528 <em>format:&lt;format-string&gt;</em>
2529 </p>
2530 <div class="paragraph"><p>The <em>format:&lt;format-string&gt;</em> format allows you to specify which information
2531 you want to show. It works a little bit like printf format,
2532 with the notable exception that you get a newline with <em>%n</em>
2533 instead of <em>\n</em>.</p></div>
2534 <div class="paragraph"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was &gt;&gt;%s&lt;&lt;%n"</em>
2535 would show something like this:</p></div>
2536 <div class="listingblock">
2537 <div class="content">
2538 <pre><code>The author of fe6e0ee was Junio C Hamano, 23 hours ago
2539 The title was &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff input.&lt;&lt;</code></pre>
2540 </div></div>
2541 <div class="paragraph"><p>The placeholders are:</p></div>
2542 <div class="ulist"><ul>
2543 <li>
2544 <p>
2545 Placeholders that expand to a single literal character:
2546 </p>
2547 <div class="dlist"><dl>
2548 <dt class="hdlist1">
2549 <em>%n</em>
2550 </dt>
2551 <dd>
2552 <p>
2553 newline
2554 </p>
2555 </dd>
2556 <dt class="hdlist1">
2557 <em>%%</em>
2558 </dt>
2559 <dd>
2560 <p>
2561 a raw <em>%</em>
2562 </p>
2563 </dd>
2564 <dt class="hdlist1">
2565 <em>%x00</em>
2566 </dt>
2567 <dd>
2568 <p>
2569 print a byte from a hex code
2570 </p>
2571 </dd>
2572 </dl></div>
2573 </li>
2574 <li>
2575 <p>
2576 Placeholders that affect formatting of later placeholders:
2577 </p>
2578 <div class="dlist"><dl>
2579 <dt class="hdlist1">
2580 <em>%Cred</em>
2581 </dt>
2582 <dd>
2583 <p>
2584 switch color to red
2585 </p>
2586 </dd>
2587 <dt class="hdlist1">
2588 <em>%Cgreen</em>
2589 </dt>
2590 <dd>
2591 <p>
2592 switch color to green
2593 </p>
2594 </dd>
2595 <dt class="hdlist1">
2596 <em>%Cblue</em>
2597 </dt>
2598 <dd>
2599 <p>
2600 switch color to blue
2601 </p>
2602 </dd>
2603 <dt class="hdlist1">
2604 <em>%Creset</em>
2605 </dt>
2606 <dd>
2607 <p>
2608 reset color
2609 </p>
2610 </dd>
2611 <dt class="hdlist1">
2612 <em>%C(&#8230;)</em>
2613 </dt>
2614 <dd>
2615 <p>
2616 color specification, as described under Values in the
2617             "CONFIGURATION FILE" section of <a href="git-config.html">git-config(1)</a>.  By
2618             default, colors are shown only when enabled for log output
2619             (by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and respecting
2620             the <code>auto</code> settings of the former if we are going to a
2621             terminal). <code>%C(auto,...)</code> is accepted as a historical
2622             synonym for the default (e.g., <code>%C(auto,red)</code>). Specifying
2623             <code>%C(always,...)</code> will show the colors even when color is
2624             not otherwise enabled (though consider just using
2625             <code>--color=always</code> to enable color for the whole output,
2626             including this format and anything else git might color).
2627             <code>auto</code> alone (i.e. <code>%C(auto)</code>) will turn on auto coloring
2628             on the next placeholders until the color is switched
2629             again.
2630 </p>
2631 </dd>
2632 <dt class="hdlist1">
2633 <em>%m</em>
2634 </dt>
2635 <dd>
2636 <p>
2637 left (<code>&lt;</code>), right (<code>&gt;</code>) or boundary (<code>-</code>) mark
2638 </p>
2639 </dd>
2640 <dt class="hdlist1">
2641 <em>%w([&lt;w&gt;[,&lt;i1&gt;[,&lt;i2&gt;]]])</em>
2642 </dt>
2643 <dd>
2644 <p>
2645 switch line wrapping, like the -w option of
2646                             <a href="git-shortlog.html">git-shortlog(1)</a>.
2647 </p>
2648 </dd>
2649 <dt class="hdlist1">
2650 <em>%&lt;( &lt;N&gt; [,trunc|ltrunc|mtrunc])</em>
2651 </dt>
2652 <dd>
2653 <p>
2654 make the next placeholder take at
2655                                   least N column widths, padding spaces on
2656                                   the right if necessary.  Optionally
2657                                   truncate (with ellipsis <em>..</em>) at the left (ltrunc) <code>..ft</code>,
2658                                   the middle (mtrunc) <code>mi..le</code>, or the end
2659                                   (trunc) <code>rig..</code>, if the output is longer than
2660                                   N columns.
2661                                   Note 1: that truncating
2662                                   only works correctly with N &gt;= 2.
2663                                   Note 2: spaces around the N and M (see below)
2664                                   values are optional.
2665                                   Note 3: Emojis and other wide characters
2666                                   will take two display columns, which may
2667                                   over-run column boundaries.
2668                                   Note 4: decomposed character combining marks
2669                                   may be misplaced at padding boundaries.
2670 </p>
2671 </dd>
2672 <dt class="hdlist1">
2673 <em>%&lt;|( &lt;M&gt; )</em>
2674 </dt>
2675 <dd>
2676 <p>
2677 make the next placeholder take at least until Mth
2678              display column, padding spaces on the right if necessary.
2679              Use negative M values for column positions measured
2680              from the right hand edge of the terminal window.
2681 </p>
2682 </dd>
2683 <dt class="hdlist1">
2684 <em>%&gt;( &lt;N&gt; )</em>, <em>%&gt;|( &lt;M&gt; )</em>
2685 </dt>
2686 <dd>
2687 <p>
2688 similar to <em>%&lt;( &lt;N&gt; )</em>, <em>%&lt;|( &lt;M&gt; )</em> respectively,
2689                         but padding spaces on the left
2690 </p>
2691 </dd>
2692 <dt class="hdlist1">
2693 <em>%&gt;&gt;( &lt;N&gt; )</em>, <em>%&gt;&gt;|( &lt;M&gt; )</em>
2694 </dt>
2695 <dd>
2696 <p>
2697 similar to <em>%&gt;( &lt;N&gt; )</em>, <em>%&gt;|( &lt;M&gt; )</em>
2698                           respectively, except that if the next
2699                           placeholder takes more spaces than given and
2700                           there are spaces on its left, use those
2701                           spaces
2702 </p>
2703 </dd>
2704 <dt class="hdlist1">
2705 <em>%&gt;&lt;( &lt;N&gt; )</em>, <em>%&gt;&lt;|( &lt;M&gt; )</em>
2706 </dt>
2707 <dd>
2708 <p>
2709 similar to <em>%&lt;( &lt;N&gt; )</em>, <em>%&lt;|( &lt;M&gt; )</em>
2710                           respectively, but padding both sides
2711                           (i.e. the text is centered)
2712 </p>
2713 </dd>
2714 </dl></div>
2715 </li>
2716 <li>
2717 <p>
2718 Placeholders that expand to information extracted from the commit:
2719 </p>
2720 <div class="dlist"><dl>
2721 <dt class="hdlist1">
2722 <em>%H</em>
2723 </dt>
2724 <dd>
2725 <p>
2726 commit hash
2727 </p>
2728 </dd>
2729 <dt class="hdlist1">
2730 <em>%h</em>
2731 </dt>
2732 <dd>
2733 <p>
2734 abbreviated commit hash
2735 </p>
2736 </dd>
2737 <dt class="hdlist1">
2738 <em>%T</em>
2739 </dt>
2740 <dd>
2741 <p>
2742 tree hash
2743 </p>
2744 </dd>
2745 <dt class="hdlist1">
2746 <em>%t</em>
2747 </dt>
2748 <dd>
2749 <p>
2750 abbreviated tree hash
2751 </p>
2752 </dd>
2753 <dt class="hdlist1">
2754 <em>%P</em>
2755 </dt>
2756 <dd>
2757 <p>
2758 parent hashes
2759 </p>
2760 </dd>
2761 <dt class="hdlist1">
2762 <em>%p</em>
2763 </dt>
2764 <dd>
2765 <p>
2766 abbreviated parent hashes
2767 </p>
2768 </dd>
2769 <dt class="hdlist1">
2770 <em>%an</em>
2771 </dt>
2772 <dd>
2773 <p>
2774 author name
2775 </p>
2776 </dd>
2777 <dt class="hdlist1">
2778 <em>%aN</em>
2779 </dt>
2780 <dd>
2781 <p>
2782 author name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
2783         or <a href="git-blame.html">git-blame(1)</a>)
2784 </p>
2785 </dd>
2786 <dt class="hdlist1">
2787 <em>%ae</em>
2788 </dt>
2789 <dd>
2790 <p>
2791 author email
2792 </p>
2793 </dd>
2794 <dt class="hdlist1">
2795 <em>%aE</em>
2796 </dt>
2797 <dd>
2798 <p>
2799 author email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a>
2800         or <a href="git-blame.html">git-blame(1)</a>)
2801 </p>
2802 </dd>
2803 <dt class="hdlist1">
2804 <em>%al</em>
2805 </dt>
2806 <dd>
2807 <p>
2808 author email local-part (the part before the <em>@</em> sign)
2809 </p>
2810 </dd>
2811 <dt class="hdlist1">
2812 <em>%aL</em>
2813 </dt>
2814 <dd>
2815 <p>
2816 author local-part (see <em>%al</em>) respecting .mailmap, see
2817         <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
2818 </p>
2819 </dd>
2820 <dt class="hdlist1">
2821 <em>%ad</em>
2822 </dt>
2823 <dd>
2824 <p>
2825 author date (format respects --date= option)
2826 </p>
2827 </dd>
2828 <dt class="hdlist1">
2829 <em>%aD</em>
2830 </dt>
2831 <dd>
2832 <p>
2833 author date, RFC2822 style
2834 </p>
2835 </dd>
2836 <dt class="hdlist1">
2837 <em>%ar</em>
2838 </dt>
2839 <dd>
2840 <p>
2841 author date, relative
2842 </p>
2843 </dd>
2844 <dt class="hdlist1">
2845 <em>%at</em>
2846 </dt>
2847 <dd>
2848 <p>
2849 author date, UNIX timestamp
2850 </p>
2851 </dd>
2852 <dt class="hdlist1">
2853 <em>%ai</em>
2854 </dt>
2855 <dd>
2856 <p>
2857 author date, ISO 8601-like format
2858 </p>
2859 </dd>
2860 <dt class="hdlist1">
2861 <em>%aI</em>
2862 </dt>
2863 <dd>
2864 <p>
2865 author date, strict ISO 8601 format
2866 </p>
2867 </dd>
2868 <dt class="hdlist1">
2869 <em>%as</em>
2870 </dt>
2871 <dd>
2872 <p>
2873 author date, short format (<code>YYYY-MM-DD</code>)
2874 </p>
2875 </dd>
2876 <dt class="hdlist1">
2877 <em>%ah</em>
2878 </dt>
2879 <dd>
2880 <p>
2881 author date, human style (like the <code>--date=human</code> option of
2882         <a href="git-rev-list.html">git-rev-list(1)</a>)
2883 </p>
2884 </dd>
2885 <dt class="hdlist1">
2886 <em>%cn</em>
2887 </dt>
2888 <dd>
2889 <p>
2890 committer name
2891 </p>
2892 </dd>
2893 <dt class="hdlist1">
2894 <em>%cN</em>
2895 </dt>
2896 <dd>
2897 <p>
2898 committer name (respecting .mailmap, see
2899         <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
2900 </p>
2901 </dd>
2902 <dt class="hdlist1">
2903 <em>%ce</em>
2904 </dt>
2905 <dd>
2906 <p>
2907 committer email
2908 </p>
2909 </dd>
2910 <dt class="hdlist1">
2911 <em>%cE</em>
2912 </dt>
2913 <dd>
2914 <p>
2915 committer email (respecting .mailmap, see
2916         <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
2917 </p>
2918 </dd>
2919 <dt class="hdlist1">
2920 <em>%cl</em>
2921 </dt>
2922 <dd>
2923 <p>
2924 committer email local-part (the part before the <em>@</em> sign)
2925 </p>
2926 </dd>
2927 <dt class="hdlist1">
2928 <em>%cL</em>
2929 </dt>
2930 <dd>
2931 <p>
2932 committer local-part (see <em>%cl</em>) respecting .mailmap, see
2933         <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
2934 </p>
2935 </dd>
2936 <dt class="hdlist1">
2937 <em>%cd</em>
2938 </dt>
2939 <dd>
2940 <p>
2941 committer date (format respects --date= option)
2942 </p>
2943 </dd>
2944 <dt class="hdlist1">
2945 <em>%cD</em>
2946 </dt>
2947 <dd>
2948 <p>
2949 committer date, RFC2822 style
2950 </p>
2951 </dd>
2952 <dt class="hdlist1">
2953 <em>%cr</em>
2954 </dt>
2955 <dd>
2956 <p>
2957 committer date, relative
2958 </p>
2959 </dd>
2960 <dt class="hdlist1">
2961 <em>%ct</em>
2962 </dt>
2963 <dd>
2964 <p>
2965 committer date, UNIX timestamp
2966 </p>
2967 </dd>
2968 <dt class="hdlist1">
2969 <em>%ci</em>
2970 </dt>
2971 <dd>
2972 <p>
2973 committer date, ISO 8601-like format
2974 </p>
2975 </dd>
2976 <dt class="hdlist1">
2977 <em>%cI</em>
2978 </dt>
2979 <dd>
2980 <p>
2981 committer date, strict ISO 8601 format
2982 </p>
2983 </dd>
2984 <dt class="hdlist1">
2985 <em>%cs</em>
2986 </dt>
2987 <dd>
2988 <p>
2989 committer date, short format (<code>YYYY-MM-DD</code>)
2990 </p>
2991 </dd>
2992 <dt class="hdlist1">
2993 <em>%ch</em>
2994 </dt>
2995 <dd>
2996 <p>
2997 committer date, human style (like the <code>--date=human</code> option of
2998         <a href="git-rev-list.html">git-rev-list(1)</a>)
2999 </p>
3000 </dd>
3001 <dt class="hdlist1">
3002 <em>%d</em>
3003 </dt>
3004 <dd>
3005 <p>
3006 ref names, like the --decorate option of <a href="git-log.html">git-log(1)</a>
3007 </p>
3008 </dd>
3009 <dt class="hdlist1">
3010 <em>%D</em>
3011 </dt>
3012 <dd>
3013 <p>
3014 ref names without the " (", ")" wrapping.
3015 </p>
3016 </dd>
3017 <dt class="hdlist1">
3018 <em>%(describe[:options])</em>
3019 </dt>
3020 <dd>
3021 <p>
3022 human-readable name, like
3023                           <a href="git-describe.html">git-describe(1)</a>; empty string for
3024                           undescribable commits.  The <code>describe</code> string
3025                           may be followed by a colon and zero or more
3026                           comma-separated options.  Descriptions can be
3027                           inconsistent when tags are added or removed at
3028                           the same time.
3029 </p>
3030 <div class="ulist"><ul>
3031 <li>
3032 <p>
3033 <em>tags[=&lt;bool-value&gt;]</em>: Instead of only considering annotated tags,
3034    consider lightweight tags as well.
3035 </p>
3036 </li>
3037 <li>
3038 <p>
3039 <em>abbrev=&lt;number&gt;</em>: Instead of using the default number of hexadecimal digits
3040    (which will vary according to the number of objects in the repository with a
3041    default of 7) of the abbreviated object name, use &lt;number&gt; digits, or as many
3042    digits as needed to form a unique object name.
3043 </p>
3044 </li>
3045 <li>
3046 <p>
3047 <em>match=&lt;pattern&gt;</em>: Only consider tags matching the given
3048    <code>glob(7)</code> pattern, excluding the "refs/tags/" prefix.
3049 </p>
3050 </li>
3051 <li>
3052 <p>
3053 <em>exclude=&lt;pattern&gt;</em>: Do not consider tags matching the given
3054    <code>glob(7)</code> pattern, excluding the "refs/tags/" prefix.
3055 </p>
3056 </li>
3057 </ul></div>
3058 </dd>
3059 <dt class="hdlist1">
3060 <em>%S</em>
3061 </dt>
3062 <dd>
3063 <p>
3064 ref name given on the command line by which the commit was reached
3065        (like <code>git log --source</code>), only works with <code>git log</code>
3066 </p>
3067 </dd>
3068 <dt class="hdlist1">
3069 <em>%e</em>
3070 </dt>
3071 <dd>
3072 <p>
3073 encoding
3074 </p>
3075 </dd>
3076 <dt class="hdlist1">
3077 <em>%s</em>
3078 </dt>
3079 <dd>
3080 <p>
3081 subject
3082 </p>
3083 </dd>
3084 <dt class="hdlist1">
3085 <em>%f</em>
3086 </dt>
3087 <dd>
3088 <p>
3089 sanitized subject line, suitable for a filename
3090 </p>
3091 </dd>
3092 <dt class="hdlist1">
3093 <em>%b</em>
3094 </dt>
3095 <dd>
3096 <p>
3097 body
3098 </p>
3099 </dd>
3100 <dt class="hdlist1">
3101 <em>%B</em>
3102 </dt>
3103 <dd>
3104 <p>
3105 raw body (unwrapped subject and body)
3106 </p>
3107 </dd>
3108 <dt class="hdlist1">
3109 <em>%N</em>
3110 </dt>
3111 <dd>
3112 <p>
3113 commit notes
3114 </p>
3115 </dd>
3116 <dt class="hdlist1">
3117 <em>%GG</em>
3118 </dt>
3119 <dd>
3120 <p>
3121 raw verification message from GPG for a signed commit
3122 </p>
3123 </dd>
3124 <dt class="hdlist1">
3125 <em>%G?</em>
3126 </dt>
3127 <dd>
3128 <p>
3129 show "G" for a good (valid) signature,
3130         "B" for a bad signature,
3131         "U" for a good signature with unknown validity,
3132         "X" for a good signature that has expired,
3133         "Y" for a good signature made by an expired key,
3134         "R" for a good signature made by a revoked key,
3135         "E" if the signature cannot be checked (e.g. missing key)
3136         and "N" for no signature
3137 </p>
3138 </dd>
3139 <dt class="hdlist1">
3140 <em>%GS</em>
3141 </dt>
3142 <dd>
3143 <p>
3144 show the name of the signer for a signed commit
3145 </p>
3146 </dd>
3147 <dt class="hdlist1">
3148 <em>%GK</em>
3149 </dt>
3150 <dd>
3151 <p>
3152 show the key used to sign a signed commit
3153 </p>
3154 </dd>
3155 <dt class="hdlist1">
3156 <em>%GF</em>
3157 </dt>
3158 <dd>
3159 <p>
3160 show the fingerprint of the key used to sign a signed commit
3161 </p>
3162 </dd>
3163 <dt class="hdlist1">
3164 <em>%GP</em>
3165 </dt>
3166 <dd>
3167 <p>
3168 show the fingerprint of the primary key whose subkey was used
3169         to sign a signed commit
3170 </p>
3171 </dd>
3172 <dt class="hdlist1">
3173 <em>%GT</em>
3174 </dt>
3175 <dd>
3176 <p>
3177 show the trust level for the key used to sign a signed commit
3178 </p>
3179 </dd>
3180 <dt class="hdlist1">
3181 <em>%gD</em>
3182 </dt>
3183 <dd>
3184 <p>
3185 reflog selector, e.g., <code>refs/stash@{1}</code> or <code>refs/stash@{2
3186         minutes ago}</code>; the format follows the rules described for the
3187         <code>-g</code> option. The portion before the <code>@</code> is the refname as
3188         given on the command line (so <code>git log -g refs/heads/master</code>
3189         would yield <code>refs/heads/master@{0}</code>).
3190 </p>
3191 </dd>
3192 <dt class="hdlist1">
3193 <em>%gd</em>
3194 </dt>
3195 <dd>
3196 <p>
3197 shortened reflog selector; same as <code>%gD</code>, but the refname
3198         portion is shortened for human readability (so
3199         <code>refs/heads/master</code> becomes just <code>master</code>).
3200 </p>
3201 </dd>
3202 <dt class="hdlist1">
3203 <em>%gn</em>
3204 </dt>
3205 <dd>
3206 <p>
3207 reflog identity name
3208 </p>
3209 </dd>
3210 <dt class="hdlist1">
3211 <em>%gN</em>
3212 </dt>
3213 <dd>
3214 <p>
3215 reflog identity name (respecting .mailmap, see
3216         <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
3217 </p>
3218 </dd>
3219 <dt class="hdlist1">
3220 <em>%ge</em>
3221 </dt>
3222 <dd>
3223 <p>
3224 reflog identity email
3225 </p>
3226 </dd>
3227 <dt class="hdlist1">
3228 <em>%gE</em>
3229 </dt>
3230 <dd>
3231 <p>
3232 reflog identity email (respecting .mailmap, see
3233         <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
3234 </p>
3235 </dd>
3236 <dt class="hdlist1">
3237 <em>%gs</em>
3238 </dt>
3239 <dd>
3240 <p>
3241 reflog subject
3242 </p>
3243 </dd>
3244 <dt class="hdlist1">
3245 <em>%(trailers[:options])</em>
3246 </dt>
3247 <dd>
3248 <p>
3249 display the trailers of the body as
3250                           interpreted by
3251                           <a href="git-interpret-trailers.html">git-interpret-trailers(1)</a>. The
3252                           <code>trailers</code> string may be followed by a colon
3253                           and zero or more comma-separated options.
3254                           If any option is provided multiple times the
3255                           last occurrence wins.
3256 </p>
3257 <div class="ulist"><ul>
3258 <li>
3259 <p>
3260 <em>key=&lt;key&gt;</em>: only show trailers with specified &lt;key&gt;. Matching is done
3261    case-insensitively and trailing colon is optional. If option is
3262    given multiple times trailer lines matching any of the keys are
3263    shown. This option automatically enables the <code>only</code> option so that
3264    non-trailer lines in the trailer block are hidden. If that is not
3265    desired it can be disabled with <code>only=false</code>.  E.g.,
3266    <code>%(trailers:key=Reviewed-by)</code> shows trailer lines with key
3267    <code>Reviewed-by</code>.
3268 </p>
3269 </li>
3270 <li>
3271 <p>
3272 <em>only[=&lt;bool&gt;]</em>: select whether non-trailer lines from the trailer
3273    block should be included.
3274 </p>
3275 </li>
3276 <li>
3277 <p>
3278 <em>separator=&lt;sep&gt;</em>: specify a separator inserted between trailer
3279    lines. When this option is not given each trailer line is
3280    terminated with a line feed character. The string &lt;sep&gt; may contain
3281    the literal formatting codes described above. To use comma as
3282    separator one must use <code>%x2C</code> as it would otherwise be parsed as
3283    next option. E.g., <code>%(trailers:key=Ticket,separator=%x2C )</code>
3284    shows all trailer lines whose key is "Ticket" separated by a comma
3285    and a space.
3286 </p>
3287 </li>
3288 <li>
3289 <p>
3290 <em>unfold[=&lt;bool&gt;]</em>: make it behave as if interpret-trailer&#8217;s <code>--unfold</code>
3291    option was given. E.g.,
3292    <code>%(trailers:only,unfold=true)</code> unfolds and shows all trailer lines.
3293 </p>
3294 </li>
3295 <li>
3296 <p>
3297 <em>keyonly[=&lt;bool&gt;]</em>: only show the key part of the trailer.
3298 </p>
3299 </li>
3300 <li>
3301 <p>
3302 <em>valueonly[=&lt;bool&gt;]</em>: only show the value part of the trailer.
3303 </p>
3304 </li>
3305 <li>
3306 <p>
3307 <em>key_value_separator=&lt;sep&gt;</em>: specify a separator inserted between
3308    trailer lines. When this option is not given each trailer key-value
3309    pair is separated by ": ". Otherwise it shares the same semantics
3310    as <em>separator=&lt;sep&gt;</em> above.
3311 </p>
3312 </li>
3313 </ul></div>
3314 </dd>
3315 </dl></div>
3316 </li>
3317 </ul></div>
3318 </li>
3319 </ul></div>
3320 <div class="admonitionblock">
3321 <table><tr>
3322 <td class="icon">
3323 <div class="title">Note</div>
3324 </td>
3325 <td class="content">Some placeholders may depend on other options given to the
3326 revision traversal engine. For example, the <code>%g*</code> reflog options will
3327 insert an empty string unless we are traversing reflog entries (e.g., by
3328 <code>git log -g</code>). The <code>%d</code> and <code>%D</code> placeholders will use the "short"
3329 decoration format if <code>--decorate</code> was not already provided on the command
3330 line.</td>
3331 </tr></table>
3332 </div>
3333 <div class="paragraph"><p>The boolean options accept an optional value <code>[=&lt;bool-value&gt;]</code>. The values
3334 <code>true</code>, <code>false</code>, <code>on</code>, <code>off</code> etc. are all accepted. See the "boolean"
3335 sub-section in "EXAMPLES" in <a href="git-config.html">git-config(1)</a>. If a boolean
3336 option is given with no value, it&#8217;s enabled.</p></div>
3337 <div class="paragraph"><p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed
3338 is inserted immediately before the expansion if and only if the
3339 placeholder expands to a non-empty string.</p></div>
3340 <div class="paragraph"><p>If you add a <code>-</code> (minus sign) after <em>%</em> of a placeholder, all consecutive
3341 line-feeds immediately preceding the expansion are deleted if and only if the
3342 placeholder expands to an empty string.</p></div>
3343 <div class="paragraph"><p>If you add a ` ` (space) after <em>%</em> of a placeholder, a space
3344 is inserted immediately before the expansion if and only if the
3345 placeholder expands to a non-empty string.</p></div>
3346 <div class="ulist"><ul>
3347 <li>
3348 <p>
3349 <em>tformat:</em>
3350 </p>
3351 <div class="paragraph"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
3352 provides "terminator" semantics instead of "separator" semantics. In
3353 other words, each commit has the message terminator character (usually a
3354 newline) appended, rather than a separator placed between entries.
3355 This means that the final entry of a single-line format will be properly
3356 terminated with a new line, just as the "oneline" format does.
3357 For example:</p></div>
3358 <div class="listingblock">
3359 <div class="content">
3360 <pre><code>$ git log -2 --pretty=format:%h 4da45bef \
3361   | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
3362 4da45be
3363 7134973 -- NO NEWLINE
3364
3365 $ git log -2 --pretty=tformat:%h 4da45bef \
3366   | perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
3367 4da45be
3368 7134973</code></pre>
3369 </div></div>
3370 <div class="paragraph"><p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted
3371 as if it has <code>tformat:</code> in front of it.  For example, these two are
3372 equivalent:</p></div>
3373 <div class="listingblock">
3374 <div class="content">
3375 <pre><code>$ git log -2 --pretty=tformat:%h 4da45bef
3376 $ git log -2 --pretty=%h 4da45bef</code></pre>
3377 </div></div>
3378 </li>
3379 </ul></div>
3380 </div>
3381 </div>
3382 <div class="sect1">
3383 <h2 id="_raw_output_format">Raw output format</h2>
3384 <div class="sectionbody">
3385 <div class="paragraph"><p>The raw output format from "git-diff-index", "git-diff-tree",
3386 "git-diff-files" and "git diff --raw" are very similar.</p></div>
3387 <div class="paragraph"><p>These commands all compare two sets of things; what is
3388 compared differs:</p></div>
3389 <div class="dlist"><dl>
3390 <dt class="hdlist1">
3391 git-diff-index &lt;tree-ish&gt;
3392 </dt>
3393 <dd>
3394 <p>
3395         compares the &lt;tree-ish&gt; and the files on the filesystem.
3396 </p>
3397 </dd>
3398 <dt class="hdlist1">
3399 git-diff-index --cached &lt;tree-ish&gt;
3400 </dt>
3401 <dd>
3402 <p>
3403         compares the &lt;tree-ish&gt; and the index.
3404 </p>
3405 </dd>
3406 <dt class="hdlist1">
3407 git-diff-tree [-r] &lt;tree-ish-1&gt; &lt;tree-ish-2&gt; [&lt;pattern&gt;&#8230;]
3408 </dt>
3409 <dd>
3410 <p>
3411         compares the trees named by the two arguments.
3412 </p>
3413 </dd>
3414 <dt class="hdlist1">
3415 git-diff-files [&lt;pattern&gt;&#8230;]
3416 </dt>
3417 <dd>
3418 <p>
3419         compares the index and the files on the filesystem.
3420 </p>
3421 </dd>
3422 </dl></div>
3423 <div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
3424 what is being compared. After that, all the commands print one output
3425 line per changed file.</p></div>
3426 <div class="paragraph"><p>An output line is formatted this way:</p></div>
3427 <div class="listingblock">
3428 <div class="content">
3429 <pre><code>in-place edit  :100644 100644 bcd1234 0123456 M file0
3430 copy-edit      :100644 100644 abcd123 1234567 C68 file1 file2
3431 rename-edit    :100644 100644 abcd123 1234567 R86 file1 file3
3432 create         :000000 100644 0000000 1234567 A file4
3433 delete         :100644 000000 1234567 0000000 D file5
3434 unmerged       :000000 000000 0000000 0000000 U file6</code></pre>
3435 </div></div>
3436 <div class="paragraph"><p>That is, from the left to the right:</p></div>
3437 <div class="olist arabic"><ol class="arabic">
3438 <li>
3439 <p>
3440 a colon.
3441 </p>
3442 </li>
3443 <li>
3444 <p>
3445 mode for "src"; 000000 if creation or unmerged.
3446 </p>
3447 </li>
3448 <li>
3449 <p>
3450 a space.
3451 </p>
3452 </li>
3453 <li>
3454 <p>
3455 mode for "dst"; 000000 if deletion or unmerged.
3456 </p>
3457 </li>
3458 <li>
3459 <p>
3460 a space.
3461 </p>
3462 </li>
3463 <li>
3464 <p>
3465 sha1 for "src"; 0{40} if creation or unmerged.
3466 </p>
3467 </li>
3468 <li>
3469 <p>
3470 a space.
3471 </p>
3472 </li>
3473 <li>
3474 <p>
3475 sha1 for "dst"; 0{40} if deletion, unmerged or "work tree out of sync with the index".
3476 </p>
3477 </li>
3478 <li>
3479 <p>
3480 a space.
3481 </p>
3482 </li>
3483 <li>
3484 <p>
3485 status, followed by optional "score" number.
3486 </p>
3487 </li>
3488 <li>
3489 <p>
3490 a tab or a NUL when <code>-z</code> option is used.
3491 </p>
3492 </li>
3493 <li>
3494 <p>
3495 path for "src"
3496 </p>
3497 </li>
3498 <li>
3499 <p>
3500 a tab or a NUL when <code>-z</code> option is used; only exists for C or R.
3501 </p>
3502 </li>
3503 <li>
3504 <p>
3505 path for "dst"; only exists for C or R.
3506 </p>
3507 </li>
3508 <li>
3509 <p>
3510 an LF or a NUL when <code>-z</code> option is used, to terminate the record.
3511 </p>
3512 </li>
3513 </ol></div>
3514 <div class="paragraph"><p>Possible status letters are:</p></div>
3515 <div class="ulist"><ul>
3516 <li>
3517 <p>
3518 A: addition of a file
3519 </p>
3520 </li>
3521 <li>
3522 <p>
3523 C: copy of a file into a new one
3524 </p>
3525 </li>
3526 <li>
3527 <p>
3528 D: deletion of a file
3529 </p>
3530 </li>
3531 <li>
3532 <p>
3533 M: modification of the contents or mode of a file
3534 </p>
3535 </li>
3536 <li>
3537 <p>
3538 R: renaming of a file
3539 </p>
3540 </li>
3541 <li>
3542 <p>
3543 T: change in the type of the file (regular file, symbolic link or submodule)
3544 </p>
3545 </li>
3546 <li>
3547 <p>
3548 U: file is unmerged (you must complete the merge before it can
3549   be committed)
3550 </p>
3551 </li>
3552 <li>
3553 <p>
3554 X: "unknown" change type (most probably a bug, please report it)
3555 </p>
3556 </li>
3557 </ul></div>
3558 <div class="paragraph"><p>Status letters C and R are always followed by a score (denoting the
3559 percentage of similarity between the source and target of the move or
3560 copy).  Status letter M may be followed by a score (denoting the
3561 percentage of dissimilarity) for file rewrites.</p></div>
3562 <div class="paragraph"><p>The sha1 for "dst" is shown as all 0&#8217;s if a file on the filesystem
3563 is out of sync with the index.</p></div>
3564 <div class="paragraph"><p>Example:</p></div>
3565 <div class="listingblock">
3566 <div class="content">
3567 <pre><code>:100644 100644 5be4a4a 0000000 M file.c</code></pre>
3568 </div></div>
3569 <div class="paragraph"><p>Without the <code>-z</code> option, pathnames with "unusual" characters are
3570 quoted as explained for the configuration variable <code>core.quotePath</code>
3571 (see <a href="git-config.html">git-config(1)</a>).  Using <code>-z</code> the filename is output
3572 verbatim and the line is terminated by a NUL byte.</p></div>
3573 </div>
3574 </div>
3575 <div class="sect1">
3576 <h2 id="_diff_format_for_merges">diff format for merges</h2>
3577 <div class="sectionbody">
3578 <div class="paragraph"><p>"git-diff-tree", "git-diff-files" and "git-diff --raw"
3579 can take <code>-c</code> or <code>--cc</code> option
3580 to generate diff output also for merge commits.  The output differs
3581 from the format described above in the following way:</p></div>
3582 <div class="olist arabic"><ol class="arabic">
3583 <li>
3584 <p>
3585 there is a colon for each parent
3586 </p>
3587 </li>
3588 <li>
3589 <p>
3590 there are more "src" modes and "src" sha1
3591 </p>
3592 </li>
3593 <li>
3594 <p>
3595 status is concatenated status characters for each parent
3596 </p>
3597 </li>
3598 <li>
3599 <p>
3600 no optional "score" number
3601 </p>
3602 </li>
3603 <li>
3604 <p>
3605 tab-separated pathname(s) of the file
3606 </p>
3607 </li>
3608 </ol></div>
3609 <div class="paragraph"><p>For <code>-c</code> and <code>--cc</code>, only the destination or final path is shown even
3610 if the file was renamed on any side of history.  With
3611 <code>--combined-all-paths</code>, the name of the path in each parent is shown
3612 followed by the name of the path in the merge commit.</p></div>
3613 <div class="paragraph"><p>Examples for <code>-c</code> and <code>--cc</code> without <code>--combined-all-paths</code>:</p></div>
3614 <div class="listingblock">
3615 <div class="content">
3616 <pre><code>::100644 100644 100644 fabadb8 cc95eb0 4866510 MM       desc.c
3617 ::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM       bar.sh
3618 ::100644 100644 100644 e07d6c5 9042e82 ee91881 RR       phooey.c</code></pre>
3619 </div></div>
3620 <div class="paragraph"><p>Examples when <code>--combined-all-paths</code> added to either <code>-c</code> or <code>--cc</code>:</p></div>
3621 <div class="listingblock">
3622 <div class="content">
3623 <pre><code>::100644 100644 100644 fabadb8 cc95eb0 4866510 MM       desc.c  desc.c  desc.c
3624 ::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM       foo.sh  bar.sh  bar.sh
3625 ::100644 100644 100644 e07d6c5 9042e82 ee91881 RR       fooey.c fuey.c  phooey.c</code></pre>
3626 </div></div>
3627 <div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
3628 all parents.</p></div>
3629 </div>
3630 </div>
3631 <div class="sect1">
3632 <h2 id="generate_patch_text_with_p">Generating patch text with -p</h2>
3633 <div class="sectionbody">
3634 <div class="paragraph"><p>Running
3635 <a href="git-diff.html">git-diff(1)</a>,
3636 <a href="git-log.html">git-log(1)</a>,
3637 <a href="git-show.html">git-show(1)</a>,
3638 <a href="git-diff-index.html">git-diff-index(1)</a>,
3639 <a href="git-diff-tree.html">git-diff-tree(1)</a>, or
3640 <a href="git-diff-files.html">git-diff-files(1)</a>
3641 with the <code>-p</code> option produces patch text.
3642 You can customize the creation of patch text via the
3643 <code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables
3644 (see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p></div>
3645 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional
3646 diff format:</p></div>
3647 <div class="olist arabic"><ol class="arabic">
3648 <li>
3649 <p>
3650 It is preceded with a "git diff" header that looks like this:
3651 </p>
3652 <div class="literalblock">
3653 <div class="content">
3654 <pre><code>diff --git a/file1 b/file2</code></pre>
3655 </div></div>
3656 <div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
3657 involved.  Especially, even for a creation or a deletion,
3658 <code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
3659 <div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the
3660 name of the source file of the rename/copy and the name of
3661 the file that rename/copy produces, respectively.</p></div>
3662 </li>
3663 <li>
3664 <p>
3665 It is followed by one or more extended header lines:
3666 </p>
3667 <div class="literalblock">
3668 <div class="content">
3669 <pre><code>old mode &lt;mode&gt;
3670 new mode &lt;mode&gt;
3671 deleted file mode &lt;mode&gt;
3672 new file mode &lt;mode&gt;
3673 copy from &lt;path&gt;
3674 copy to &lt;path&gt;
3675 rename from &lt;path&gt;
3676 rename to &lt;path&gt;
3677 similarity index &lt;number&gt;
3678 dissimilarity index &lt;number&gt;
3679 index &lt;hash&gt;..&lt;hash&gt; &lt;mode&gt;</code></pre>
3680 </div></div>
3681 <div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
3682 and file permission bits.</p></div>
3683 <div class="paragraph"><p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p></div>
3684 <div class="paragraph"><p>The similarity index is the percentage of unchanged lines, and
3685 the dissimilarity index is the percentage of changed lines.  It
3686 is a rounded down integer, followed by a percent sign.  The
3687 similarity index value of 100% is thus reserved for two equal
3688 files, while 100% dissimilarity means that no line from the old
3689 file made it into the new one.</p></div>
3690 <div class="paragraph"><p>The index line includes the blob object names before and after the change.
3691 The &lt;mode&gt; is included if the file mode does not change; otherwise,
3692 separate lines indicate the old and the new mode.</p></div>
3693 </li>
3694 <li>
3695 <p>
3696 Pathnames with "unusual" characters are quoted as explained for
3697     the configuration variable <code>core.quotePath</code> (see
3698     <a href="git-config.html">git-config(1)</a>).
3699 </p>
3700 </li>
3701 <li>
3702 <p>
3703 All the <code>file1</code> files in the output refer to files before the
3704     commit, and all the <code>file2</code> files refer to files after the commit.
3705     It is incorrect to apply each change to each file sequentially.  For
3706     example, this patch will swap a and b:
3707 </p>
3708 <div class="literalblock">
3709 <div class="content">
3710 <pre><code>diff --git a/a b/b
3711 rename from a
3712 rename to b
3713 diff --git a/b b/a
3714 rename from b
3715 rename to a</code></pre>
3716 </div></div>
3717 </li>
3718 <li>
3719 <p>
3720 Hunk headers mention the name of the function to which the hunk
3721     applies.  See "Defining a custom hunk-header" in
3722     <a href="gitattributes.html">gitattributes(5)</a> for details of how to tailor to this to
3723     specific languages.
3724 </p>
3725 </li>
3726 </ol></div>
3727 </div>
3728 </div>
3729 <div class="sect1">
3730 <h2 id="_combined_diff_format">Combined diff format</h2>
3731 <div class="sectionbody">
3732 <div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
3733 produce a <em>combined diff</em> when showing a merge. This is the default
3734 format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
3735 <a href="git-show.html">git-show(1)</a>. Note also that you can give suitable
3736 <code>--diff-merges</code> option to any of these commands to force generation of
3737 diffs in specific format.</p></div>
3738 <div class="paragraph"><p>A "combined diff" format looks like this:</p></div>
3739 <div class="listingblock">
3740 <div class="content">
3741 <pre><code>diff --combined describe.c
3742 index fabadb8,cc95eb0..4866510
3743 --- a/describe.c
3744 +++ b/describe.c
3745 @@@ -98,20 -98,12 +98,20 @@@
3746         return (a_date &gt; b_date) ? -1 : (a_date == b_date) ? 0 : 1;
3747   }
3748
3749 - static void describe(char *arg)
3750  -static void describe(struct commit *cmit, int last_one)
3751 ++static void describe(char *arg, int last_one)
3752   {
3753  +      unsigned char sha1[20];
3754  +      struct commit *cmit;
3755         struct commit_list *list;
3756         static int initialized = 0;
3757         struct commit_name *n;
3758
3759  +      if (get_sha1(arg, sha1) &lt; 0)
3760  +              usage(describe_usage);
3761  +      cmit = lookup_commit_reference(sha1);
3762  +      if (!cmit)
3763  +              usage(describe_usage);
3764  +
3765         if (!initialized) {
3766                 initialized = 1;
3767                 for_each_ref(get_name);</code></pre>
3768 </div></div>
3769 <div class="olist arabic"><ol class="arabic">
3770 <li>
3771 <p>
3772 It is preceded with a "git diff" header, that looks like
3773      this (when the <code>-c</code> option is used):
3774 </p>
3775 <div class="literalblock">
3776 <div class="content">
3777 <pre><code>diff --combined file</code></pre>
3778 </div></div>
3779 <div class="paragraph"><p>or like this (when the <code>--cc</code> option is used):</p></div>
3780 <div class="literalblock">
3781 <div class="content">
3782 <pre><code>diff --cc file</code></pre>
3783 </div></div>
3784 </li>
3785 <li>
3786 <p>
3787 It is followed by one or more extended header lines
3788      (this example shows a merge with two parents):
3789 </p>
3790 <div class="literalblock">
3791 <div class="content">
3792 <pre><code>index &lt;hash&gt;,&lt;hash&gt;..&lt;hash&gt;
3793 mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;
3794 new file mode &lt;mode&gt;
3795 deleted file mode &lt;mode&gt;,&lt;mode&gt;</code></pre>
3796 </div></div>
3797 <div class="paragraph"><p>The <code>mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;</code> line appears only if at least one of
3798 the &lt;mode&gt; is different from the rest. Extended headers with
3799 information about detected contents movement (renames and
3800 copying detection) are designed to work with diff of two
3801 &lt;tree-ish&gt; and are not used by combined diff format.</p></div>
3802 </li>
3803 <li>
3804 <p>
3805 It is followed by two-line from-file/to-file header
3806 </p>
3807 <div class="literalblock">
3808 <div class="content">
3809 <pre><code>--- a/file
3810 +++ b/file</code></pre>
3811 </div></div>
3812 <div class="paragraph"><p>Similar to two-line header for traditional <em>unified</em> diff
3813 format, <code>/dev/null</code> is used to signal created or deleted
3814 files.</p></div>
3815 <div class="paragraph"><p>However, if the --combined-all-paths option is provided, instead of a
3816 two-line from-file/to-file you get a N+1 line from-file/to-file header,
3817 where N is the number of parents in the merge commit</p></div>
3818 <div class="literalblock">
3819 <div class="content">
3820 <pre><code>--- a/file
3821 --- a/file
3822 --- a/file
3823 +++ b/file</code></pre>
3824 </div></div>
3825 <div class="paragraph"><p>This extended format can be useful if rename or copy detection is
3826 active, to allow you to see the original name of the file in different
3827 parents.</p></div>
3828 </li>
3829 <li>
3830 <p>
3831 Chunk header format is modified to prevent people from
3832      accidentally feeding it to <code>patch -p1</code>. Combined diff format
3833      was created for review of merge commit changes, and was not
3834      meant to be applied. The change is similar to the change in the
3835      extended <em>index</em> header:
3836 </p>
3837 <div class="literalblock">
3838 <div class="content">
3839 <pre><code>@@@ &lt;from-file-range&gt; &lt;from-file-range&gt; &lt;to-file-range&gt; @@@</code></pre>
3840 </div></div>
3841 <div class="paragraph"><p>There are (number of parents + 1) <code>@</code> characters in the chunk
3842 header for combined diff format.</p></div>
3843 </li>
3844 </ol></div>
3845 <div class="paragraph"><p>Unlike the traditional <em>unified</em> diff format, which shows two
3846 files A and B with a single column that has <code>-</code> (minus&#8201;&#8212;&#8201;appears in A but removed in B), <code>+</code> (plus&#8201;&#8212;&#8201;missing in A but
3847 added to B), or <code>" "</code> (space&#8201;&#8212;&#8201;unchanged) prefix, this format
3848 compares two or more files file1, file2,&#8230; with one file X, and
3849 shows how X differs from each of fileN.  One column for each of
3850 fileN is prepended to the output line to note how X&#8217;s line is
3851 different from it.</p></div>
3852 <div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
3853 fileN but it does not appear in the result.  A <code>+</code> character
3854 in the column N means that the line appears in the result,
3855 and fileN does not have that line (in other words, the line was
3856 added, from the point of view of that parent).</p></div>
3857 <div class="paragraph"><p>In the above example output, the function signature was changed
3858 from both files (hence two <code>-</code> removals from both file1 and
3859 file2, plus <code>++</code> to mean one line that was added does not appear
3860 in either file1 or file2).  Also eight other lines are the same
3861 from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
3862 <div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
3863 merge commit with the merge result (i.e. file1..fileN are the
3864 parents).  When shown by <code>git diff-files -c</code>, it compares the
3865 two unresolved merge parents with the working tree file
3866 (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
3867 "their version").</p></div>
3868 </div>
3869 </div>
3870 <div class="sect1">
3871 <h2 id="_other_diff_formats">other diff formats</h2>
3872 <div class="sectionbody">
3873 <div class="paragraph"><p>The <code>--summary</code> option describes newly added, deleted, renamed and
3874 copied files.  The <code>--stat</code> option adds diffstat(1) graph to the
3875 output.  These options can be combined with other options, such as
3876 <code>-p</code>, and are meant for human consumption.</p></div>
3877 <div class="paragraph"><p>When showing a change that involves a rename or a copy, <code>--stat</code> output
3878 formats the pathnames compactly by combining common prefix and suffix of
3879 the pathnames.  For example, a change that moves <code>arch/i386/Makefile</code> to
3880 <code>arch/x86/Makefile</code> while modifying 4 lines will be shown like this:</p></div>
3881 <div class="listingblock">
3882 <div class="content">
3883 <pre><code>arch/{i386 =&gt; x86}/Makefile    |   4 +--</code></pre>
3884 </div></div>
3885 <div class="paragraph"><p>The <code>--numstat</code> option gives the diffstat(1) information but is designed
3886 for easier machine consumption.  An entry in <code>--numstat</code> output looks
3887 like this:</p></div>
3888 <div class="listingblock">
3889 <div class="content">
3890 <pre><code>1       2       README
3891 3       1       arch/{i386 =&gt; x86}/Makefile</code></pre>
3892 </div></div>
3893 <div class="paragraph"><p>That is, from left to right:</p></div>
3894 <div class="olist arabic"><ol class="arabic">
3895 <li>
3896 <p>
3897 the number of added lines;
3898 </p>
3899 </li>
3900 <li>
3901 <p>
3902 a tab;
3903 </p>
3904 </li>
3905 <li>
3906 <p>
3907 the number of deleted lines;
3908 </p>
3909 </li>
3910 <li>
3911 <p>
3912 a tab;
3913 </p>
3914 </li>
3915 <li>
3916 <p>
3917 pathname (possibly with rename/copy information);
3918 </p>
3919 </li>
3920 <li>
3921 <p>
3922 a newline.
3923 </p>
3924 </li>
3925 </ol></div>
3926 <div class="paragraph"><p>When <code>-z</code> output option is in effect, the output is formatted this way:</p></div>
3927 <div class="listingblock">
3928 <div class="content">
3929 <pre><code>1       2       README NUL
3930 3       1       NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</code></pre>
3931 </div></div>
3932 <div class="paragraph"><p>That is:</p></div>
3933 <div class="olist arabic"><ol class="arabic">
3934 <li>
3935 <p>
3936 the number of added lines;
3937 </p>
3938 </li>
3939 <li>
3940 <p>
3941 a tab;
3942 </p>
3943 </li>
3944 <li>
3945 <p>
3946 the number of deleted lines;
3947 </p>
3948 </li>
3949 <li>
3950 <p>
3951 a tab;
3952 </p>
3953 </li>
3954 <li>
3955 <p>
3956 a NUL (only exists if renamed/copied);
3957 </p>
3958 </li>
3959 <li>
3960 <p>
3961 pathname in preimage;
3962 </p>
3963 </li>
3964 <li>
3965 <p>
3966 a NUL (only exists if renamed/copied);
3967 </p>
3968 </li>
3969 <li>
3970 <p>
3971 pathname in postimage (only exists if renamed/copied);
3972 </p>
3973 </li>
3974 <li>
3975 <p>
3976 a NUL.
3977 </p>
3978 </li>
3979 </ol></div>
3980 <div class="paragraph"><p>The extra <code>NUL</code> before the preimage path in renamed case is to allow
3981 scripts that read the output to tell if the current record being read is
3982 a single-path record or a rename/copy record without reading ahead.
3983 After reading added and deleted lines, reading up to <code>NUL</code> would yield
3984 the pathname, but if that is <code>NUL</code>, the record will show two paths.</p></div>
3985 </div>
3986 </div>
3987 <div class="sect1">
3988 <h2 id="_git">GIT</h2>
3989 <div class="sectionbody">
3990 <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
3991 </div>
3992 </div>
3993 </div>
3994 <div id="footnotes"><hr /></div>
3995 <div id="footer">
3996 <div id="footer-text">
3997 Last updated
3998  2021-12-10 14:52:02 PST
3999 </div>
4000 </div>
4001 </body>
4002 </html>