1116 lines
32 KiB
HTML
1116 lines
32 KiB
HTML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
|
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
|
|
<head>
|
|
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
|
|
<meta name="generator" content="AsciiDoc 10.2.0" />
|
|
<title>git-range-diff(1)</title>
|
|
<style type="text/css">
|
|
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
|
|
|
|
/* Default font. */
|
|
body {
|
|
font-family: Georgia,serif;
|
|
}
|
|
|
|
/* Title font. */
|
|
h1, h2, h3, h4, h5, h6,
|
|
div.title, caption.title,
|
|
thead, p.table.header,
|
|
#toctitle,
|
|
#author, #revnumber, #revdate, #revremark,
|
|
#footer {
|
|
font-family: Arial,Helvetica,sans-serif;
|
|
}
|
|
|
|
body {
|
|
margin: 1em 5% 1em 5%;
|
|
}
|
|
|
|
a {
|
|
color: blue;
|
|
text-decoration: underline;
|
|
}
|
|
a:visited {
|
|
color: fuchsia;
|
|
}
|
|
|
|
em {
|
|
font-style: italic;
|
|
color: navy;
|
|
}
|
|
|
|
strong {
|
|
font-weight: bold;
|
|
color: #083194;
|
|
}
|
|
|
|
h1, h2, h3, h4, h5, h6 {
|
|
color: #527bbd;
|
|
margin-top: 1.2em;
|
|
margin-bottom: 0.5em;
|
|
line-height: 1.3;
|
|
}
|
|
|
|
h1, h2, h3 {
|
|
border-bottom: 2px solid silver;
|
|
}
|
|
h2 {
|
|
padding-top: 0.5em;
|
|
}
|
|
h3 {
|
|
float: left;
|
|
}
|
|
h3 + * {
|
|
clear: left;
|
|
}
|
|
h5 {
|
|
font-size: 1.0em;
|
|
}
|
|
|
|
div.sectionbody {
|
|
margin-left: 0;
|
|
}
|
|
|
|
hr {
|
|
border: 1px solid silver;
|
|
}
|
|
|
|
p {
|
|
margin-top: 0.5em;
|
|
margin-bottom: 0.5em;
|
|
}
|
|
|
|
ul, ol, li > p {
|
|
margin-top: 0;
|
|
}
|
|
ul > li { color: #aaa; }
|
|
ul > li > * { color: black; }
|
|
|
|
.monospaced, code, pre {
|
|
font-family: "Courier New", Courier, monospace;
|
|
font-size: inherit;
|
|
color: navy;
|
|
padding: 0;
|
|
margin: 0;
|
|
}
|
|
pre {
|
|
white-space: pre-wrap;
|
|
}
|
|
|
|
#author {
|
|
color: #527bbd;
|
|
font-weight: bold;
|
|
font-size: 1.1em;
|
|
}
|
|
#email {
|
|
}
|
|
#revnumber, #revdate, #revremark {
|
|
}
|
|
|
|
#footer {
|
|
font-size: small;
|
|
border-top: 2px solid silver;
|
|
padding-top: 0.5em;
|
|
margin-top: 4.0em;
|
|
}
|
|
#footer-text {
|
|
float: left;
|
|
padding-bottom: 0.5em;
|
|
}
|
|
#footer-badges {
|
|
float: right;
|
|
padding-bottom: 0.5em;
|
|
}
|
|
|
|
#preamble {
|
|
margin-top: 1.5em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.imageblock, div.exampleblock, div.verseblock,
|
|
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
|
|
div.admonitionblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.admonitionblock {
|
|
margin-top: 2.0em;
|
|
margin-bottom: 2.0em;
|
|
margin-right: 10%;
|
|
color: #606060;
|
|
}
|
|
|
|
div.content { /* Block element content. */
|
|
padding: 0;
|
|
}
|
|
|
|
/* Block element titles. */
|
|
div.title, caption.title {
|
|
color: #527bbd;
|
|
font-weight: bold;
|
|
text-align: left;
|
|
margin-top: 1.0em;
|
|
margin-bottom: 0.5em;
|
|
}
|
|
div.title + * {
|
|
margin-top: 0;
|
|
}
|
|
|
|
td div.title:first-child {
|
|
margin-top: 0.0em;
|
|
}
|
|
div.content div.title:first-child {
|
|
margin-top: 0.0em;
|
|
}
|
|
div.content + div.title {
|
|
margin-top: 0.0em;
|
|
}
|
|
|
|
div.sidebarblock > div.content {
|
|
background: #ffffee;
|
|
border: 1px solid #dddddd;
|
|
border-left: 4px solid #f0f0f0;
|
|
padding: 0.5em;
|
|
}
|
|
|
|
div.listingblock > div.content {
|
|
border: 1px solid #dddddd;
|
|
border-left: 5px solid #f0f0f0;
|
|
background: #f8f8f8;
|
|
padding: 0.5em;
|
|
}
|
|
|
|
div.quoteblock, div.verseblock {
|
|
padding-left: 1.0em;
|
|
margin-left: 1.0em;
|
|
margin-right: 10%;
|
|
border-left: 5px solid #f0f0f0;
|
|
color: #888;
|
|
}
|
|
|
|
div.quoteblock > div.attribution {
|
|
padding-top: 0.5em;
|
|
text-align: right;
|
|
}
|
|
|
|
div.verseblock > pre.content {
|
|
font-family: inherit;
|
|
font-size: inherit;
|
|
}
|
|
div.verseblock > div.attribution {
|
|
padding-top: 0.75em;
|
|
text-align: left;
|
|
}
|
|
/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
|
|
div.verseblock + div.attribution {
|
|
text-align: left;
|
|
}
|
|
|
|
div.admonitionblock .icon {
|
|
vertical-align: top;
|
|
font-size: 1.1em;
|
|
font-weight: bold;
|
|
text-decoration: underline;
|
|
color: #527bbd;
|
|
padding-right: 0.5em;
|
|
}
|
|
div.admonitionblock td.content {
|
|
padding-left: 0.5em;
|
|
border-left: 3px solid #dddddd;
|
|
}
|
|
|
|
div.exampleblock > div.content {
|
|
border-left: 3px solid #dddddd;
|
|
padding-left: 0.5em;
|
|
}
|
|
|
|
div.imageblock div.content { padding-left: 0; }
|
|
span.image img { border-style: none; vertical-align: text-bottom; }
|
|
a.image:visited { color: white; }
|
|
|
|
dl {
|
|
margin-top: 0.8em;
|
|
margin-bottom: 0.8em;
|
|
}
|
|
dt {
|
|
margin-top: 0.5em;
|
|
margin-bottom: 0;
|
|
font-style: normal;
|
|
color: navy;
|
|
}
|
|
dd > *:first-child {
|
|
margin-top: 0.1em;
|
|
}
|
|
|
|
ul, ol {
|
|
list-style-position: outside;
|
|
}
|
|
ol.arabic {
|
|
list-style-type: decimal;
|
|
}
|
|
ol.loweralpha {
|
|
list-style-type: lower-alpha;
|
|
}
|
|
ol.upperalpha {
|
|
list-style-type: upper-alpha;
|
|
}
|
|
ol.lowerroman {
|
|
list-style-type: lower-roman;
|
|
}
|
|
ol.upperroman {
|
|
list-style-type: upper-roman;
|
|
}
|
|
|
|
div.compact ul, div.compact ol,
|
|
div.compact p, div.compact p,
|
|
div.compact div, div.compact div {
|
|
margin-top: 0.1em;
|
|
margin-bottom: 0.1em;
|
|
}
|
|
|
|
tfoot {
|
|
font-weight: bold;
|
|
}
|
|
td > div.verse {
|
|
white-space: pre;
|
|
}
|
|
|
|
div.hdlist {
|
|
margin-top: 0.8em;
|
|
margin-bottom: 0.8em;
|
|
}
|
|
div.hdlist tr {
|
|
padding-bottom: 15px;
|
|
}
|
|
dt.hdlist1.strong, td.hdlist1.strong {
|
|
font-weight: bold;
|
|
}
|
|
td.hdlist1 {
|
|
vertical-align: top;
|
|
font-style: normal;
|
|
padding-right: 0.8em;
|
|
color: navy;
|
|
}
|
|
td.hdlist2 {
|
|
vertical-align: top;
|
|
}
|
|
div.hdlist.compact tr {
|
|
margin: 0;
|
|
padding-bottom: 0;
|
|
}
|
|
|
|
.comment {
|
|
background: yellow;
|
|
}
|
|
|
|
.footnote, .footnoteref {
|
|
font-size: 0.8em;
|
|
}
|
|
|
|
span.footnote, span.footnoteref {
|
|
vertical-align: super;
|
|
}
|
|
|
|
#footnotes {
|
|
margin: 20px 0 20px 0;
|
|
padding: 7px 0 0 0;
|
|
}
|
|
|
|
#footnotes div.footnote {
|
|
margin: 0 0 5px 0;
|
|
}
|
|
|
|
#footnotes hr {
|
|
border: none;
|
|
border-top: 1px solid silver;
|
|
height: 1px;
|
|
text-align: left;
|
|
margin-left: 0;
|
|
width: 20%;
|
|
min-width: 100px;
|
|
}
|
|
|
|
div.colist td {
|
|
padding-right: 0.5em;
|
|
padding-bottom: 0.3em;
|
|
vertical-align: top;
|
|
}
|
|
div.colist td img {
|
|
margin-top: 0.3em;
|
|
}
|
|
|
|
@media print {
|
|
#footer-badges { display: none; }
|
|
}
|
|
|
|
#toc {
|
|
margin-bottom: 2.5em;
|
|
}
|
|
|
|
#toctitle {
|
|
color: #527bbd;
|
|
font-size: 1.1em;
|
|
font-weight: bold;
|
|
margin-top: 1.0em;
|
|
margin-bottom: 0.1em;
|
|
}
|
|
|
|
div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
|
|
margin-top: 0;
|
|
margin-bottom: 0;
|
|
}
|
|
div.toclevel2 {
|
|
margin-left: 2em;
|
|
font-size: 0.9em;
|
|
}
|
|
div.toclevel3 {
|
|
margin-left: 4em;
|
|
font-size: 0.9em;
|
|
}
|
|
div.toclevel4 {
|
|
margin-left: 6em;
|
|
font-size: 0.9em;
|
|
}
|
|
|
|
span.aqua { color: aqua; }
|
|
span.black { color: black; }
|
|
span.blue { color: blue; }
|
|
span.fuchsia { color: fuchsia; }
|
|
span.gray { color: gray; }
|
|
span.green { color: green; }
|
|
span.lime { color: lime; }
|
|
span.maroon { color: maroon; }
|
|
span.navy { color: navy; }
|
|
span.olive { color: olive; }
|
|
span.purple { color: purple; }
|
|
span.red { color: red; }
|
|
span.silver { color: silver; }
|
|
span.teal { color: teal; }
|
|
span.white { color: white; }
|
|
span.yellow { color: yellow; }
|
|
|
|
span.aqua-background { background: aqua; }
|
|
span.black-background { background: black; }
|
|
span.blue-background { background: blue; }
|
|
span.fuchsia-background { background: fuchsia; }
|
|
span.gray-background { background: gray; }
|
|
span.green-background { background: green; }
|
|
span.lime-background { background: lime; }
|
|
span.maroon-background { background: maroon; }
|
|
span.navy-background { background: navy; }
|
|
span.olive-background { background: olive; }
|
|
span.purple-background { background: purple; }
|
|
span.red-background { background: red; }
|
|
span.silver-background { background: silver; }
|
|
span.teal-background { background: teal; }
|
|
span.white-background { background: white; }
|
|
span.yellow-background { background: yellow; }
|
|
|
|
span.big { font-size: 2em; }
|
|
span.small { font-size: 0.6em; }
|
|
|
|
span.underline { text-decoration: underline; }
|
|
span.overline { text-decoration: overline; }
|
|
span.line-through { text-decoration: line-through; }
|
|
|
|
div.unbreakable { page-break-inside: avoid; }
|
|
|
|
|
|
/*
|
|
* xhtml11 specific
|
|
*
|
|
* */
|
|
|
|
div.tableblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
div.tableblock > table {
|
|
border: 3px solid #527bbd;
|
|
}
|
|
thead, p.table.header {
|
|
font-weight: bold;
|
|
color: #527bbd;
|
|
}
|
|
p.table {
|
|
margin-top: 0;
|
|
}
|
|
/* Because the table frame attribute is overridden by CSS in most browsers. */
|
|
div.tableblock > table[frame="void"] {
|
|
border-style: none;
|
|
}
|
|
div.tableblock > table[frame="hsides"] {
|
|
border-left-style: none;
|
|
border-right-style: none;
|
|
}
|
|
div.tableblock > table[frame="vsides"] {
|
|
border-top-style: none;
|
|
border-bottom-style: none;
|
|
}
|
|
|
|
|
|
/*
|
|
* html5 specific
|
|
*
|
|
* */
|
|
|
|
table.tableblock {
|
|
margin-top: 1.0em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
thead, p.tableblock.header {
|
|
font-weight: bold;
|
|
color: #527bbd;
|
|
}
|
|
p.tableblock {
|
|
margin-top: 0;
|
|
}
|
|
table.tableblock {
|
|
border-width: 3px;
|
|
border-spacing: 0px;
|
|
border-style: solid;
|
|
border-color: #527bbd;
|
|
border-collapse: collapse;
|
|
}
|
|
th.tableblock, td.tableblock {
|
|
border-width: 1px;
|
|
padding: 4px;
|
|
border-style: solid;
|
|
border-color: #527bbd;
|
|
}
|
|
|
|
table.tableblock.frame-topbot {
|
|
border-left-style: hidden;
|
|
border-right-style: hidden;
|
|
}
|
|
table.tableblock.frame-sides {
|
|
border-top-style: hidden;
|
|
border-bottom-style: hidden;
|
|
}
|
|
table.tableblock.frame-none {
|
|
border-style: hidden;
|
|
}
|
|
|
|
th.tableblock.halign-left, td.tableblock.halign-left {
|
|
text-align: left;
|
|
}
|
|
th.tableblock.halign-center, td.tableblock.halign-center {
|
|
text-align: center;
|
|
}
|
|
th.tableblock.halign-right, td.tableblock.halign-right {
|
|
text-align: right;
|
|
}
|
|
|
|
th.tableblock.valign-top, td.tableblock.valign-top {
|
|
vertical-align: top;
|
|
}
|
|
th.tableblock.valign-middle, td.tableblock.valign-middle {
|
|
vertical-align: middle;
|
|
}
|
|
th.tableblock.valign-bottom, td.tableblock.valign-bottom {
|
|
vertical-align: bottom;
|
|
}
|
|
|
|
|
|
/*
|
|
* manpage specific
|
|
*
|
|
* */
|
|
|
|
body.manpage h1 {
|
|
padding-top: 0.5em;
|
|
padding-bottom: 0.5em;
|
|
border-top: 2px solid silver;
|
|
border-bottom: 2px solid silver;
|
|
}
|
|
body.manpage h2 {
|
|
border-style: none;
|
|
}
|
|
body.manpage div.sectionbody {
|
|
margin-left: 3em;
|
|
}
|
|
|
|
@media print {
|
|
body.manpage div#toc { display: none; }
|
|
}
|
|
|
|
|
|
</style>
|
|
<script type="text/javascript">
|
|
/*<+'])');
|
|
// Function that scans the DOM tree for header elements (the DOM2
|
|
// nodeIterator API would be a better technique but not supported by all
|
|
// browsers).
|
|
var iterate = function (el) {
|
|
for (var i = el.firstChild; i != null; i = i.nextSibling) {
|
|
if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
|
|
var mo = re.exec(i.tagName);
|
|
if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
|
|
result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
|
|
}
|
|
iterate(i);
|
|
}
|
|
}
|
|
}
|
|
iterate(el);
|
|
return result;
|
|
}
|
|
|
|
var toc = document.getElementById("toc");
|
|
if (!toc) {
|
|
return;
|
|
}
|
|
|
|
// Delete existing TOC entries in case we're reloading the TOC.
|
|
var tocEntriesToRemove = [];
|
|
var i;
|
|
for (i = 0; i < toc.childNodes.length; i++) {
|
|
var entry = toc.childNodes[i];
|
|
if (entry.nodeName.toLowerCase() == 'div'
|
|
&& entry.getAttribute("class")
|
|
&& entry.getAttribute("class").match(/^toclevel/))
|
|
tocEntriesToRemove.push(entry);
|
|
}
|
|
for (i = 0; i < tocEntriesToRemove.length; i++) {
|
|
toc.removeChild(tocEntriesToRemove[i]);
|
|
}
|
|
|
|
// Rebuild TOC entries.
|
|
var entries = tocEntries(document.getElementById("content"), toclevels);
|
|
for (var i = 0; i < entries.length; ++i) {
|
|
var entry = entries[i];
|
|
if (entry.element.id == "")
|
|
entry.element.id = "_toc_" + i;
|
|
var a = document.createElement("a");
|
|
a.href = "#" + entry.element.id;
|
|
a.appendChild(document.createTextNode(entry.text));
|
|
var div = document.createElement("div");
|
|
div.appendChild(a);
|
|
div.className = "toclevel" + entry.toclevel;
|
|
toc.appendChild(div);
|
|
}
|
|
if (entries.length == 0)
|
|
toc.parentNode.removeChild(toc);
|
|
},
|
|
|
|
|
|
/////////////////////////////////////////////////////////////////////
|
|
// Footnotes generator
|
|
/////////////////////////////////////////////////////////////////////
|
|
|
|
/* Based on footnote generation code from:
|
|
* http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
|
|
*/
|
|
|
|
footnotes: function () {
|
|
// Delete existing footnote entries in case we're reloading the footnodes.
|
|
var i;
|
|
var noteholder = document.getElementById("footnotes");
|
|
if (!noteholder) {
|
|
return;
|
|
}
|
|
var entriesToRemove = [];
|
|
for (i = 0; i < noteholder.childNodes.length; i++) {
|
|
var entry = noteholder.childNodes[i];
|
|
if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
|
|
entriesToRemove.push(entry);
|
|
}
|
|
for (i = 0; i < entriesToRemove.length; i++) {
|
|
noteholder.removeChild(entriesToRemove[i]);
|
|
}
|
|
|
|
// Rebuild footnote entries.
|
|
var cont = document.getElementById("content");
|
|
var spans = cont.getElementsByTagName("span");
|
|
var refs = {};
|
|
var n = 0;
|
|
for (i=0; i<spans.length; i++) {
|
|
if (spans[i].className == "footnote") {
|
|
n++;
|
|
var note = spans[i].getAttribute("data-note");
|
|
if (!note) {
|
|
// Use [\s\S] in place of . so multi-line matches work.
|
|
// Because JavaScript has no s (dotall) regex flag.
|
|
note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
|
|
spans[i].innerHTML =
|
|
"[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
|
|
"' title='View footnote' class='footnote'>" + n + "</a>]";
|
|
spans[i].setAttribute("data-note", note);
|
|
}
|
|
noteholder.innerHTML +=
|
|
"<div class='footnote' id='_footnote_" + n + "'>" +
|
|
"<a href='#_footnoteref_" + n + "' title='Return to text'>" +
|
|
n + "</a>. " + note + "</div>";
|
|
var id =spans[i].getAttribute("id");
|
|
if (id != null) refs["#"+id] = n;
|
|
}
|
|
}
|
|
if (n == 0)
|
|
noteholder.parentNode.removeChild(noteholder);
|
|
else {
|
|
// Process footnoterefs.
|
|
for (i=0; i<spans.length; i++) {
|
|
if (spans[i].className == "footnoteref") {
|
|
var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
|
|
href = href.match(/#.*/)[0]; // Because IE return full URL.
|
|
n = refs[href];
|
|
spans[i].innerHTML =
|
|
"[<a href='#_footnote_" + n +
|
|
"' title='View footnote' class='footnote'>" + n + "</a>]";
|
|
}
|
|
}
|
|
}
|
|
},
|
|
|
|
install: function(toclevels) {
|
|
var timerId;
|
|
|
|
function reinstall() {
|
|
asciidoc.footnotes();
|
|
if (toclevels) {
|
|
asciidoc.toc(toclevels);
|
|
}
|
|
}
|
|
|
|
function reinstallAndRemoveTimer() {
|
|
clearInterval(timerId);
|
|
reinstall();
|
|
}
|
|
|
|
timerId = setInterval(reinstall, 500);
|
|
if (document.addEventListener)
|
|
document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
|
|
else
|
|
window.onload = reinstallAndRemoveTimer;
|
|
}
|
|
|
|
}
|
|
asciidoc.install();
|
|
/*]]>*/
|
|
</script>
|
|
</head>
|
|
<body class="manpage">
|
|
<div id="header">
|
|
<h1>
|
|
git-range-diff(1) Manual Page
|
|
</h1>
|
|
<h2>NAME</h2>
|
|
<div class="sectionbody">
|
|
<p>git-range-diff -
|
|
Compare two commit ranges (e.g. two versions of a branch)
|
|
</p>
|
|
</div>
|
|
</div>
|
|
<div id="content">
|
|
<div class="sect1">
|
|
<h2 id="_synopsis">SYNOPSIS</h2>
|
|
<div class="sectionbody">
|
|
<div class="verseblock">
|
|
<pre class="content"><em>git range-diff</em> [--color=[<when>]] [--no-color] [<diff-options>]
|
|
[--no-dual-color] [--creation-factor=<factor>]
|
|
[--left-only | --right-only] [--diff-merges=<format>]
|
|
[--remerge-diff]
|
|
( <range1> <range2> | <rev1>…<rev2> | <base> <rev1> <rev2> )
|
|
[[--] <path>…]</pre>
|
|
<div class="attribution">
|
|
</div></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_description">DESCRIPTION</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>This command shows the differences between two versions of a patch
|
|
series, or more generally, two commit ranges (ignoring merge commits).</p></div>
|
|
<div class="paragraph"><p>In the presence of <em><path></em> arguments, these commit ranges are limited
|
|
accordingly.</p></div>
|
|
<div class="paragraph"><p>To that end, it first finds pairs of commits from both commit ranges
|
|
that correspond with each other. Two commits are said to correspond when
|
|
the diff between their patches (i.e. the author information, the commit
|
|
message and the commit diff) is reasonably small compared to the
|
|
patches' size. See ``Algorithm`` below for details.</p></div>
|
|
<div class="paragraph"><p>Finally, the list of matching commits is shown in the order of the
|
|
second commit range, with unmatched commits being inserted just after
|
|
all of their ancestors have been shown.</p></div>
|
|
<div class="paragraph"><p>There are three ways to specify the commit ranges:</p></div>
|
|
<div class="ulist"><ul>
|
|
<li>
|
|
<p>
|
|
<em><range1></em> <em><range2></em>: Either commit range can be of the form
|
|
<em><base></em><code>..</code><em><rev></em>, <em><rev></em><code>^</code>! or <em><rev></em><code>^-</code><em><n></em>. See <code>SPECIFYING</code> <code>RANGES</code>
|
|
in <a href="gitrevisions.html">gitrevisions(7)</a> for more details.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<em><rev1></em><code>...</code><em><rev2></em>. This is equivalent to
|
|
<em><rev2></em><code>..</code><em><rev1></em> <em><rev1></em><code>..</code><em><rev2></em>.
|
|
</p>
|
|
</li>
|
|
<li>
|
|
<p>
|
|
<em><base></em> <em><rev1></em> <em><rev2></em>: This is equivalent to <em><base></em><code>..</code><em><rev1></em>
|
|
<em><base></em><code>..</code><em><rev2></em>.
|
|
</p>
|
|
</li>
|
|
</ul></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_options">OPTIONS</h2>
|
|
<div class="sectionbody">
|
|
<div class="dlist"><dl>
|
|
<dt class="hdlist1">
|
|
--no-dual-color
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
When the commit diffs differ, ‘git range-diff` recreates the
|
|
original diffs’ coloring, and adds outer -/+ diff markers with
|
|
the <strong>background</strong> being red/green to make it easier to see e.g.
|
|
when there was a change in what exact lines were added.
|
|
</p>
|
|
<div class="paragraph"><p>Additionally, the commit diff lines that are only present in the first commit
|
|
range are shown "dimmed" (this can be overridden using the <code>color.diff.</code><em><slot></em>
|
|
config setting where <em><slot></em> is one of <code>contextDimmed</code>, <code>oldDimmed</code> and
|
|
<code>newDimmed</code>), and the commit diff lines that are only present in the second
|
|
commit range are shown in bold (which can be overridden using the config
|
|
settings <code>color.diff.</code><em><slot></em> with <em><slot></em> being one of <code>contextBold</code>,
|
|
<code>oldBold</code> or <code>newBold</code>).</p></div>
|
|
<div class="paragraph"><p>This is known to <code>range-diff</code> as "dual coloring". Use <code>--no-dual-color</code>
|
|
to revert to color all lines according to the outer diff markers
|
|
(and completely ignore the inner diff when it comes to color).</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--creation-factor=<percent>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Set the creation/deletion cost fudge factor to <em><percent></em>.
|
|
Defaults to 60. Try a larger value if <code>git</code> <code>range-diff</code> erroneously
|
|
considers a large change a total rewrite (deletion of one commit
|
|
and addition of another), and a smaller one in the reverse case.
|
|
See the ``Algorithm`` section below for an explanation of why this is
|
|
needed.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--left-only
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Suppress commits that are missing from the first specified range
|
|
(or the "left range" when using the <em><rev1></em><code>...</code><em><rev2></em> format).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--right-only
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Suppress commits that are missing from the second specified range
|
|
(or the "right range" when using the <em><rev1></em><code>...</code><em><rev2></em> format).
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--diff-merges=<format>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Instead of ignoring merge commits, generate diffs for them using the
|
|
corresponding <code>--diff-merges=</code><em><format></em> option of <a href="git-log.html">git-log(1)</a>,
|
|
and include them in the comparison.
|
|
</p>
|
|
<div class="paragraph"><p>Note: In the common case, the <code>remerge</code> mode will be the most natural one
|
|
to use, as it shows only the diff on top of what Git’s merge machinery would
|
|
have produced. In other words, if a merge commit is the result of a
|
|
non-conflicting <code>git</code> <code>merge</code>, the <code>remerge</code> mode will represent it with an empty
|
|
diff.</p></div>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--remerge-diff
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Convenience option, equivalent to <code>--diff-merges=remerge</code>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
--[no-]notes[=<ref>]
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
This flag is passed to the <code>git</code> <code>log</code> program
|
|
(see <a href="git-log.html">git-log(1)</a>) that generates the patches.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<range1> <range2>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Compare the commits specified by the two ranges, where
|
|
<em><range1></em> is considered an older version of <em><range2></em>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<rev1>…<rev2>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Equivalent to passing <em><rev2></em><code>..</code><em><rev1></em> and <em><rev1></em><code>..</code><em><rev2></em>.
|
|
</p>
|
|
</dd>
|
|
<dt class="hdlist1">
|
|
<base> <rev1> <rev2>
|
|
</dt>
|
|
<dd>
|
|
<p>
|
|
Equivalent to passing <em><base></em><code>..</code><em><rev1></em> and <em><base></em><code>..</code><em><rev2></em>.
|
|
Note that <em><base></em> does not need to be the exact branch point
|
|
of the branches. Example: after rebasing a branch <code>my-topic</code>,
|
|
<code>git</code> <code>range-diff</code> <code>my-topic@</code>{u} <code>my-topic@</code>{1} <code>my-topic</code> would
|
|
show the differences introduced by the rebase.
|
|
</p>
|
|
</dd>
|
|
</dl></div>
|
|
<div class="paragraph"><p><code>git</code> <code>range-diff</code> also accepts the regular diff options (see
|
|
<a href="git-diff.html">git-diff(1)</a>), most notably the <code>--color=</code>[<em><when></em>] and
|
|
<code>--no-color</code> options. These options are used when generating the "diff
|
|
between patches", i.e. to compare the author, commit message and diff of
|
|
corresponding old/new commits. There is currently no means to tweak most of the
|
|
diff options passed to <code>git</code> <code>log</code> when generating those patches.</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_output_stability">OUTPUT STABILITY</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>The output of the <code>range-diff</code> command is subject to change. It is
|
|
intended to be human-readable porcelain output, not something that can
|
|
be used across versions of Git to get a textually stable <code>range-diff</code>
|
|
(as opposed to something like the <code>--stable</code> option to
|
|
<a href="git-patch-id.html">git-patch-id(1)</a>). There’s also no equivalent of
|
|
<a href="git-apply.html">git-apply(1)</a> for <code>range-diff</code>, the output is not intended to
|
|
be machine-readable.</p></div>
|
|
<div class="paragraph"><p>This is particularly true when passing in diff options. Currently some
|
|
options like <code>--stat</code> can, as an emergent effect, produce output
|
|
that’s quite useless in the context of <code>range-diff</code>. Future versions
|
|
of <code>range-diff</code> may learn to interpret such options in a manner
|
|
specific to <code>range-diff</code> (e.g. for <code>--stat</code> producing human-readable
|
|
output which summarizes how the diffstat changed).</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_configuration">CONFIGURATION</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>This command uses the <code>diff.color.*</code> and <code>pager.range-diff</code> settings
|
|
(the latter is on by default).
|
|
See <a href="git-config.html">git-config(1)</a>.</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_examples">EXAMPLES</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>When a rebase required merge conflicts to be resolved, compare the changes
|
|
introduced by the rebase directly afterwards using:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>$ git range-diff @{u} @{1} @</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>A typical output of <code>git</code> <code>range-diff</code> would look like this:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code>-: ------- > 1: 0ddba11 Prepare for the inevitable!
|
|
1: c0debee = 2: cab005e Add a helpful message at the start
|
|
2: f00dbal ! 3: decafe1 Describe a bug
|
|
@@ -1,3 +1,3 @@
|
|
Author: A U Thor <author@example.com>
|
|
|
|
-TODO: Describe a bug
|
|
+Describe a bug
|
|
@@ -324,5 +324,6
|
|
This is expected.
|
|
|
|
-+What is unexpected is that it will also crash.
|
|
++Unexpectedly, it also crashes. This is a bug, and the jury is
|
|
++still out there how to fix it best. See ticket #314 for details.
|
|
|
|
Contact
|
|
3: bedead < -: ------- TO-UNDO</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>In this example, there are 3 old and 3 new commits, where the developer
|
|
removed the 3rd, added a new one before the first two, and modified the
|
|
commit message of the 2nd commit as well as its diff.</p></div>
|
|
<div class="paragraph"><p>When the output goes to a terminal, it is color-coded by default, just
|
|
like regular <code>git</code> <code>diff</code>'s output. In addition, the first line (adding a
|
|
commit) is green, the last line (deleting a commit) is red, the second
|
|
line (with a perfect match) is yellow like the commit header of <code>git</code>
|
|
<code>show</code>'s output, and the third line colors the old commit red, the new
|
|
one green and the rest like <code>git</code> <code>show</code>'s commit header.</p></div>
|
|
<div class="paragraph"><p>A naive color-coded diff of diffs is actually a bit hard to read,
|
|
though, as it colors the entire lines red or green. The line that added
|
|
"What is unexpected" in the old commit, for example, is completely red,
|
|
even if the intent of the old commit was to add something.</p></div>
|
|
<div class="paragraph"><p>To help with that, <code>range</code> uses the <code>--dual-color</code> mode by default. In
|
|
this mode, the diff of diffs will retain the original diff colors, and
|
|
prefix the lines with -/+ markers that have their <strong>background</strong> red or
|
|
green, to make it more obvious that they describe how the diff itself
|
|
changed.</p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_algorithm">Algorithm</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>The general idea is this: we generate a cost matrix between the commits
|
|
in both commit ranges, then solve the least-cost assignment.</p></div>
|
|
<div class="paragraph"><p>The cost matrix is populated thusly: for each pair of commits, both
|
|
diffs are generated and the "diff of diffs" is generated, with 3 context
|
|
lines, then the number of lines in that diff is used as cost.</p></div>
|
|
<div class="paragraph"><p>To avoid false positives (e.g. when a patch has been removed, and an
|
|
unrelated patch has been added between two iterations of the same patch
|
|
series), the cost matrix is extended to allow for that, by adding
|
|
fixed-cost entries for wholesale deletes/adds.</p></div>
|
|
<div class="paragraph"><p>Example: Let commits <code>1--2</code> be the first iteration of a patch series and
|
|
<code>A--C</code> the second iteration. Let’s assume that <code>A</code> is a cherry-pick of
|
|
<code>2,</code> and <code>C</code> is a cherry-pick of <code>1</code> but with a small modification (say,
|
|
a fixed typo). Visualize the commits as a bipartite graph:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code> 1 A
|
|
|
|
2 B
|
|
|
|
C</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>We are looking for a "best" explanation of the new series in terms of
|
|
the old one. We can represent an "explanation" as an edge in the graph:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code> 1 A
|
|
/
|
|
2 --------' B
|
|
|
|
C</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>This explanation comes for "free" because there was no change. Similarly
|
|
<code>C</code> could be explained using <code>1</code>, but that comes at some cost c>0
|
|
because of the modification:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code> 1 ----. A
|
|
| /
|
|
2 ----+---' B
|
|
|
|
|
`----- C
|
|
c>0</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>In mathematical terms, what we are looking for is some sort of a minimum
|
|
cost bipartite matching; ‘1` is matched to <code>C</code> at some cost, etc. The
|
|
underlying graph is in fact a complete bipartite graph; the cost we
|
|
associate with every edge is the size of the diff between the two
|
|
commits’ patches. To explain also new commits, we introduce dummy nodes
|
|
on both sides:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code> 1 ----. A
|
|
| /
|
|
2 ----+---' B
|
|
|
|
|
o `----- C
|
|
c>0
|
|
o o
|
|
|
|
o o</code></pre>
|
|
</div></div>
|
|
<div class="paragraph"><p>The cost of an edge <code>o--C</code> is the size of <code>C</code>'s diff, modified by a
|
|
fudge factor that should be smaller than 100%. The cost of an edge
|
|
<code>o--o</code> is free. The fudge factor is necessary because even if <code>1</code> and
|
|
<code>C</code> have nothing in common, they may still share a few empty lines and
|
|
such, possibly making the assignment <code>1--C</code>, <code>o--o</code> slightly cheaper
|
|
than <code>1--o</code>, <code>o--C</code> even if <code>1</code> and <code>C</code> have nothing in common. With the
|
|
fudge factor we require a much larger common part to consider patches as
|
|
corresponding.</p></div>
|
|
<div class="paragraph"><p>The overall time needed to compute this algorithm is the time needed to
|
|
compute n+m commit diffs and then n*m diffs of patches, plus the time
|
|
needed to compute the least-cost assignment between n and m diffs. Git
|
|
uses an implementation of the Jonker-Volgenant algorithm to solve the
|
|
assignment problem, which has cubic runtime complexity. The matching
|
|
found in this case will look like this:</p></div>
|
|
<div class="listingblock">
|
|
<div class="content">
|
|
<pre><code> 1 ----. A
|
|
| /
|
|
2 ----+---' B
|
|
.--+-----'
|
|
o -' `----- C
|
|
c>0
|
|
o ---------- o
|
|
|
|
o ---------- o</code></pre>
|
|
</div></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_see_also">SEE ALSO</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p><a href="git-log.html">git-log(1)</a></p></div>
|
|
</div>
|
|
</div>
|
|
<div class="sect1">
|
|
<h2 id="_git">GIT</h2>
|
|
<div class="sectionbody">
|
|
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div id="footnotes"><hr /></div>
|
|
<div id="footer">
|
|
<div id="footer-text">
|
|
Last updated
|
|
2025-08-18 02:18:23 CEST
|
|
</div>
|
|
</div>
|
|
</body>
|
|
</html>
|