diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-12-18 16:28:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-18 16:28:27 -0800 |
| commit | 9629d4f49e5ffcff5c5beb5c40bedcffcabcd905 (patch) | |
| tree | 09bbf284bbbd162a829a1b2025e9528ec0be4365 /git-log.html | |
| parent | dcd381c2ac2f9c58ca5acb7dac9d077c57bc3609 (diff) | |
| download | git-htmldocs-9629d4f49e5ffcff5c5beb5c40bedcffcabcd905.tar.gz | |
Autogenerated HTML docs for v1.8.1-rc2-5-g252f9
Diffstat (limited to 'git-log.html')
| -rw-r--r-- | git-log.html | 1037 |
1 files changed, 626 insertions, 411 deletions
diff --git a/git-log.html b/git-log.html index 2b0cec018..17da80ad4 100644 --- a/git-log.html +++ b/git-log.html @@ -2,15 +2,25 @@ "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="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.5.2" />
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+<meta name="generator" content="AsciiDoc 8.6.8" />
<title>git-log(1)</title>
<style type="text/css">
-/* Debug borders */
-p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
-/*
- border: 1px solid red;
-*/
+/* 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 {
@@ -35,13 +45,8 @@ strong { color: #083194;
}
-tt {
- color: navy;
-}
-
h1, h2, h3, h4, h5, h6 {
color: #527bbd;
- font-family: sans-serif;
margin-top: 1.2em;
margin-bottom: 0.5em;
line-height: 1.3;
@@ -59,9 +64,11 @@ h3 { h3 + * {
clear: left;
}
+h5 {
+ font-size: 1.0em;
+}
div.sectionbody {
- font-family: serif;
margin-left: 0;
}
@@ -77,45 +84,48 @@ p { ul, ol, li > p {
margin-top: 0;
}
+ul > li { color: #aaa; }
+ul > li > * { color: black; }
-pre {
+.monospaced, code, pre {
+ font-family: "Courier New", Courier, monospace;
+ font-size: inherit;
+ color: navy;
padding: 0;
margin: 0;
}
-span#author {
+
+#author {
color: #527bbd;
- font-family: sans-serif;
font-weight: bold;
font-size: 1.1em;
}
-span#email {
+#email {
}
-span#revnumber, span#revdate, span#revremark {
- font-family: sans-serif;
+#revnumber, #revdate, #revremark {
}
-div#footer {
- font-family: sans-serif;
+#footer {
font-size: small;
border-top: 2px solid silver;
padding-top: 0.5em;
margin-top: 4.0em;
}
-div#footer-text {
+#footer-text {
float: left;
padding-bottom: 0.5em;
}
-div#footer-badges {
+#footer-badges {
float: right;
padding-bottom: 0.5em;
}
-div#preamble {
+#preamble {
margin-top: 1.5em;
margin-bottom: 1.5em;
}
-div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
+div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
margin-top: 1.0em;
@@ -135,7 +145,6 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
color: #527bbd;
- font-family: sans-serif;
font-weight: bold;
text-align: left;
margin-top: 1.0em;
@@ -157,13 +166,15 @@ div.content + div.title { div.sidebarblock > div.content {
background: #ffffee;
- border: 1px solid silver;
+ border: 1px solid #dddddd;
+ border-left: 4px solid #f0f0f0;
padding: 0.5em;
}
div.listingblock > div.content {
- border: 1px solid silver;
- background: #f4f4f4;
+ border: 1px solid #dddddd;
+ border-left: 5px solid #f0f0f0;
+ background: #f8f8f8;
padding: 0.5em;
}
@@ -171,8 +182,8 @@ div.quoteblock, div.verseblock { padding-left: 1.0em;
margin-left: 1.0em;
margin-right: 10%;
- border-left: 5px solid #dddddd;
- color: #777777;
+ border-left: 5px solid #f0f0f0;
+ color: #888;
}
div.quoteblock > div.attribution {
@@ -180,8 +191,9 @@ div.quoteblock > div.attribution { text-align: right;
}
-div.verseblock > div.content {
- white-space: pre;
+div.verseblock > pre.content {
+ font-family: inherit;
+ font-size: inherit;
}
div.verseblock > div.attribution {
padding-top: 0.75em;
@@ -254,35 +266,12 @@ div.compact div, div.compact div { margin-bottom: 0.1em;
}
-div.tableblock > table {
- border: 3px solid #527bbd;
-}
-thead, p.table.header {
- font-family: sans-serif;
- font-weight: bold;
-}
tfoot {
font-weight: bold;
}
td > div.verse {
white-space: pre;
}
-p.table {
- margin-top: 0;
-}
-/* Because the table frame attribute is overriden 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;
-}
-
div.hdlist {
margin-top: 0.8em;
@@ -339,25 +328,32 @@ span.footnote, span.footnoteref { 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 {
- div#footer-badges { display: none; }
+ #footer-badges { display: none; }
}
-div#toc {
+#toc {
margin-bottom: 2.5em;
}
-div#toctitle {
+#toctitle {
color: #527bbd;
- font-family: sans-serif;
font-size: 1.1em;
font-weight: bold;
margin-top: 1.0em;
margin-bottom: 0.1em;
}
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
@@ -373,69 +369,173 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-/* Overrides for manpage documents */
-h1 {
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- border-top: 2px solid silver;
- border-bottom: 2px solid silver;
+
+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;
}
-h2 {
+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 overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
border-style: none;
}
-div.sectionbody {
- margin-left: 5%;
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
}
-
-@media print {
- div#toc { display: none; }
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
}
-/* Workarounds for IE6's broken and incomplete CSS2. */
-div.sidebar-content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
+/*
+ * html5 specific
+ *
+ * */
+
+table.tableblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
}
-div.sidebar-title, div.image-title {
- color: #527bbd;
- font-family: sans-serif;
+thead, p.tableblock.header {
font-weight: bold;
- margin-top: 0.0em;
- margin-bottom: 0.5em;
+ 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;
}
-div.listingblock div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
+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;
}
-div.quoteblock-attribution {
- padding-top: 0.5em;
+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;
}
-div.verseblock-content {
- white-space: pre;
+th.tableblock.valign-top, td.tableblock.valign-top {
+ vertical-align: top;
}
-div.verseblock-attribution {
- padding-top: 0.75em;
- text-align: left;
+th.tableblock.valign-middle, td.tableblock.valign-middle {
+ vertical-align: middle;
+}
+th.tableblock.valign-bottom, td.tableblock.valign-bottom {
+ vertical-align: bottom;
}
-div.exampleblock-content {
- border-left: 3px solid #dddddd;
- padding-left: 0.5em;
+
+/*
+ * 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;
}
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
+@media print {
+ body.manpage div#toc { display: none; }
+}
+
+
</style>
<script type="text/javascript">
/*<+'])');
+ var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
// Function that scans the DOM tree for header elements (the DOM2
// nodeIterator API would be a better technique but not supported by all
// browsers).
@@ -497,6 +597,25 @@ toc: function (toclevels) { }
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];
@@ -524,24 +643,44 @@ toc: function (toclevels) { */
footnotes: function () {
- var cont = document.getElementById("content");
+ // 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++;
- // 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];
+ 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>";
- spans[i].innerHTML =
- "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
- "' title='View footnote' class='footnote'>" + n + "</a>]";
var id =spans[i].getAttribute("id");
if (id != null) refs["#"+id] = n;
}
@@ -561,13 +700,36 @@ footnotes: function () { }
}
}
+},
+
+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>
+<body class="manpage">
<div id="header">
<h1>
git-log(1) Manual Page
@@ -580,13 +742,16 @@ git-log(1) Manual Page </div>
</div>
<div id="content">
+<div class="sect1">
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="verseblock-content"><em>git log</em> [<options>] [<since>..<until>] [[--] <path>…]</div>
-<div class="verseblock-attribution">
+<pre class="content"><em>git log</em> [<options>] [<since>..<until>] [[--] <path>…]</pre>
+<div class="attribution">
</div></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>Shows the commit logs.</p></div>
@@ -595,6 +760,8 @@ command to control what is shown and how, and options applicable to the <em>git diff-*</em> commands to control how the changes
each commit introduces are shown.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
<div class="dlist"><dl>
@@ -605,7 +772,7 @@ each commit introduces are shown.</p></div> <p>
Show only commits between the named two commits. When
either <since> or <until> is omitted, it defaults to
- <tt>HEAD</tt>, i.e. the tip of the current branch.
+ <code>HEAD</code>, i.e. the tip of the current branch.
For a more complete list of ways to spell <since>
and <until>, see <a href="gitrevisions.html">gitrevisions(7)</a>.
</p>
@@ -683,16 +850,19 @@ produced by --stat etc.</p></div> be prefixed with "-- " to separate them from options or refnames.</p></div>
</dd>
</dl></div>
-<h3 id="_commit_limiting">Commit Limiting</h3><div style="clear:left"></div>
+<div class="sect2">
+<h3 id="_commit_limiting">Commit Limiting</h3>
<div class="paragraph"><p>Besides specifying a range of commits that should be listed using the
special notations explained in the description, additional commit
limiting may be applied.</p></div>
<div class="paragraph"><p>Using more options generally further limits the output (e.g.
-<tt>--since=<date1></tt> limits to commits newer than <tt><date1></tt>, and using it
-with <tt>--grep=<pattern></tt> further limits to commits whose log message
-has a line that matches <tt><pattern></tt>), unless otherwise noted.</p></div>
+<code>--since=<date1></code> limits to commits newer than <code><date1></code>, and using it
+with <code>--grep=<pattern></code> further limits to commits whose log message
+has a line that matches <code><pattern></code>), unless otherwise noted.</p></div>
<div class="paragraph"><p>Note that these are applied before commit
-ordering and formatting options, such as <tt>--reverse</tt>.</p></div>
+ordering and formatting options, such as <code>--reverse</code>.</p></div>
+<div class="openblock">
+<div class="content">
<div class="dlist"><dl>
<dt class="hdlist1">
-<number>
@@ -748,9 +918,9 @@ ordering and formatting options, such as <tt>--reverse</tt>.</p></div> <p>
Limit the commits output to ones with author/committer
header lines that match the specified pattern (regular
- expression). With more than one <tt>--author=<pattern></tt>,
+ expression). With more than one <code>--author=<pattern></code>,
commits whose author matches any of the given patterns are
- chosen (similarly for multiple <tt>--committer=<pattern></tt>).
+ chosen (similarly for multiple <code>--committer=<pattern></code>).
</p>
</dd>
<dt class="hdlist1">
@@ -760,9 +930,9 @@ ordering and formatting options, such as <tt>--reverse</tt>.</p></div> <p>
Limit the commits output to ones with reflog entries that
match the specified pattern (regular expression). With
- more than one <tt>--grep-reflog</tt>, commits whose reflog message
+ more than one <code>--grep-reflog</code>, commits whose reflog message
matches any of the given patterns are chosen. It is an
- error to use this option unless <tt>--walk-reflogs</tt> is in use.
+ error to use this option unless <code>--walk-reflogs</code> is in use.
</p>
</dd>
<dt class="hdlist1">
@@ -772,11 +942,11 @@ ordering and formatting options, such as <tt>--reverse</tt>.</p></div> <p>
Limit the commits output to ones with log message that
matches the specified pattern (regular expression). With
- more than one <tt>--grep=<pattern></tt>, commits whose message
+ more than one <code>--grep=<pattern></code>, commits whose message
matches any of the given patterns are chosen (but see
- <tt>--all-match</tt>).
+ <code>--all-match</code>).
</p>
-<div class="paragraph"><p>When <tt>--show-notes</tt> is in effect, the message from the notes as
+<div class="paragraph"><p>When <code>--show-notes</code> is in effect, the message from the notes as
if it is part of the log message.</p></div>
</dd>
<dt class="hdlist1">
@@ -854,7 +1024,7 @@ if it is part of the log message.</p></div> </dt>
<dd>
<p>
- Print only merge commits. This is exactly the same as <tt>--min-parents=2</tt>.
+ Print only merge commits. This is exactly the same as <code>--min-parents=2</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -863,7 +1033,7 @@ if it is part of the log message.</p></div> <dd>
<p>
Do not print commits with more than one parent. This is
- exactly the same as <tt>--max-parents=1</tt>.
+ exactly the same as <code>--max-parents=1</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -881,13 +1051,13 @@ if it is part of the log message.</p></div> <dd>
<p>
Show only commits which have at least (or at most) that many
- commits. In particular, <tt>--max-parents=1</tt> is the same as <tt>--no-merges</tt>,
- <tt>--min-parents=2</tt> is the same as <tt>--merges</tt>. <tt>--max-parents=0</tt>
- gives all root commits and <tt>--min-parents=3</tt> all octopus merges.
+ commits. In particular, <code>--max-parents=1</code> is the same as <code>--no-merges</code>,
+ <code>--min-parents=2</code> is the same as <code>--merges</code>. <code>--max-parents=0</code>
+ gives all root commits and <code>--min-parents=3</code> all octopus merges.
</p>
-<div class="paragraph"><p><tt>--no-min-parents</tt> and <tt>--no-max-parents</tt> reset these limits (to no limit)
-again. Equivalent forms are <tt>--min-parents=0</tt> (any commit has 0 or more
-parents) and <tt>--max-parents=-1</tt> (negative numbers denote no upper limit).</p></div>
+<div class="paragraph"><p><code>--no-min-parents</code> and <code>--no-max-parents</code> reset these limits (to no limit)
+again. Equivalent forms are <code>--min-parents=0</code> (any commit has 0 or more
+parents) and <code>--max-parents=-1</code> (negative numbers denote no upper limit).</p></div>
</dd>
<dt class="hdlist1">
--first-parent
@@ -917,7 +1087,7 @@ parents) and <tt>--max-parents=-1</tt> (negative numbers denote no upper limit). </dt>
<dd>
<p>
- Pretend as if all the refs in <tt>refs/</tt> are listed on the
+ Pretend as if all the refs in <code>refs/</code> are listed on the
command line as <em><commit></em>.
</p>
</dd>
@@ -926,7 +1096,7 @@ parents) and <tt>--max-parents=-1</tt> (negative numbers denote no upper limit). </dt>
<dd>
<p>
- Pretend as if all the refs in <tt>refs/heads</tt> are listed
+ Pretend as if all the refs in <code>refs/heads</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
branches to ones matching given shell glob. If pattern lacks <em>?</em>,
<em>*</em>, or <em>[</em>, <em>/*</em> at the end is implied.
@@ -937,7 +1107,7 @@ parents) and <tt>--max-parents=-1</tt> (negative numbers denote no upper limit). </dt>
<dd>
<p>
- Pretend as if all the refs in <tt>refs/tags</tt> are listed
+ Pretend as if all the refs in <code>refs/tags</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
tags to ones matching given shell glob. If pattern lacks <em>?</em>, <em>*</em>,
or <em>[</em>, <em>/*</em> at the end is implied.
@@ -948,7 +1118,7 @@ parents) and <tt>--max-parents=-1</tt> (negative numbers denote no upper limit). </dt>
<dd>
<p>
- Pretend as if all the refs in <tt>refs/remotes</tt> are listed
+ Pretend as if all the refs in <code>refs/remotes</code> are listed
on the command line as <em><commit></em>. If <em><pattern></em> is given, limit
remote-tracking branches to ones matching given shell glob.
If pattern lacks <em>?</em>, <em>*</em>, or <em>[</em>, <em>/*</em> at the end is implied.
@@ -979,9 +1149,9 @@ parents) and <tt>--max-parents=-1</tt> (negative numbers denote no upper limit). </dt>
<dd>
<p>
- Pretend as if the bad bisection ref <tt>refs/bisect/bad</tt>
- was listed and as if it was followed by <tt>--not</tt> and the good
- bisection refs <tt>refs/bisect/good-*</tt> on the command
+ Pretend as if the bad bisection ref <code>refs/bisect/bad</code>
+ was listed and as if it was followed by <code>--not</code> and the good
+ bisection refs <code>refs/bisect/good-*</code> on the command
line.
</p>
</dd>
@@ -1001,8 +1171,8 @@ parents) and <tt>--max-parents=-1</tt> (negative numbers denote no upper limit). </dt>
<dd>
<p>
- Like <tt>--cherry-pick</tt> (see below) but mark equivalent commits
- with <tt>=</tt> rather than omitting them, and inequivalent ones with <tt>+</tt>.
+ Like <code>--cherry-pick</code> (see below) but mark equivalent commits
+ with <code>=</code> rather than omitting them, and inequivalent ones with <code>+</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1014,10 +1184,10 @@ parents) and <tt>--max-parents=-1</tt> (negative numbers denote no upper limit). another commit on the "other side" when the set of
commits are limited with symmetric difference.
</p>
-<div class="paragraph"><p>For example, if you have two branches, <tt>A</tt> and <tt>B</tt>, a usual way
+<div class="paragraph"><p>For example, if you have two branches, <code>A</code> and <code>B</code>, a usual way
to list all commits on only one side of them is with
-<tt>--left-right</tt> (see the example below in the description of
-the <tt>--left-right</tt> option). It however shows the commits that were cherry-picked
+<code>--left-right</code> (see the example below in the description of
+the <code>--left-right</code> option). It however shows the commits that were cherry-picked
from the other branch (for example, "3rd on b" may be cherry-picked
from branch A). With this option, such pairs of commits are
excluded from the output.</p></div>
@@ -1031,13 +1201,13 @@ excluded from the output.</p></div> <dd>
<p>
List only commits on the respective side of a symmetric range,
- i.e. only those which would be marked <tt><</tt> resp. <tt>></tt> by
- <tt>--left-right</tt>.
+ i.e. only those which would be marked <code><</code> resp. <code>></code> by
+ <code>--left-right</code>.
</p>
-<div class="paragraph"><p>For example, <tt>--cherry-pick --right-only A...B</tt> omits those
-commits from <tt>B</tt> which are in <tt>A</tt> or are patch-equivalent to a commit in
-<tt>A</tt>. In other words, this lists the <tt>+</tt> commits from <tt>git cherry A B</tt>.
-More precisely, <tt>--cherry-pick --right-only --no-merges</tt> gives the exact
+<div class="paragraph"><p>For example, <code>--cherry-pick --right-only A...B</code> omits those
+commits from <code>B</code> which are in <code>A</code> or are patch-equivalent to a commit in
+<code>A</code>. In other words, this lists the <code>+</code> commits from <code>git cherry A B</code>.
+More precisely, <code>--cherry-pick --right-only --no-merges</code> gives the exact
list.</p></div>
</dd>
<dt class="hdlist1">
@@ -1045,11 +1215,11 @@ list.</p></div> </dt>
<dd>
<p>
- A synonym for <tt>--right-only --cherry-mark --no-merges</tt>; useful to
+ A synonym for <code>--right-only --cherry-mark --no-merges</code>; useful to
limit the output to the commits on our side and mark those that
have been applied to the other side of a forked history with
- <tt>git log --cherry upstream...mybranch</tt>, similar to
- <tt>git cherry upstream mybranch</tt>.
+ <code>git log --cherry upstream...mybranch</code>, similar to
+ <code>git cherry upstream mybranch</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1095,7 +1265,10 @@ See also <a href="git-reflog.html">git-reflog(1)</a>.</p></div> </p>
</dd>
</dl></div>
-<h3 id="_history_simplification">History Simplification</h3><div style="clear:left"></div>
+</div></div>
+</div>
+<div class="sect2">
+<h3 id="_history_simplification">History Simplification</h3>
<div class="paragraph"><p>Sometimes you are only interested in parts of the history, for example the
commits modifying a particular <path>. But there are two parts of
<em>History Simplification</em>, one part is selecting the commits and the other
@@ -1182,57 +1355,57 @@ Default mode </dd>
</dl></div>
<div class="paragraph"><p>A more detailed explanation follows.</p></div>
-<div class="paragraph"><p>Suppose you specified <tt>foo</tt> as the <paths>. We shall call commits
-that modify <tt>foo</tt> !TREESAME, and the rest TREESAME. (In a diff
-filtered for <tt>foo</tt>, they look different and equal, respectively.)</p></div>
+<div class="paragraph"><p>Suppose you specified <code>foo</code> as the <paths>. We shall call commits
+that modify <code>foo</code> !TREESAME, and the rest TREESAME. (In a diff
+filtered for <code>foo</code>, they look different and equal, respectively.)</p></div>
<div class="paragraph"><p>In the following, we will always refer to the same example history to
illustrate the differences between simplification settings. We assume
-that you are filtering for a file <tt>foo</tt> in this commit graph:</p></div>
+that you are filtering for a file <code>foo</code> in this commit graph:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> .-A---M---N---O---P
+<pre><code> .-A---M---N---O---P
/ / / / /
I B C D E
\ / / / /
- `-------------'</tt></pre>
+ `-------------'</code></pre>
</div></div>
<div class="paragraph"><p>The horizontal line of history A---P is taken to be the first parent of
each merge. The commits are:</p></div>
<div class="ulist"><ul>
<li>
<p>
-<tt>I</tt> is the initial commit, in which <tt>foo</tt> exists with contents
- "asdf", and a file <tt>quux</tt> exists with contents "quux". Initial
- commits are compared to an empty tree, so <tt>I</tt> is !TREESAME.
+<code>I</code> is the initial commit, in which <code>foo</code> exists with contents
+ "asdf", and a file <code>quux</code> exists with contents "quux". Initial
+ commits are compared to an empty tree, so <code>I</code> is !TREESAME.
</p>
</li>
<li>
<p>
-In <tt>A</tt>, <tt>foo</tt> contains just "foo".
+In <code>A</code>, <code>foo</code> contains just "foo".
</p>
</li>
<li>
<p>
-<tt>B</tt> contains the same change as <tt>A</tt>. Its merge <tt>M</tt> is trivial and
+<code>B</code> contains the same change as <code>A</code>. Its merge <code>M</code> is trivial and
hence TREESAME to all parents.
</p>
</li>
<li>
<p>
-<tt>C</tt> does not change <tt>foo</tt>, but its merge <tt>N</tt> changes it to "foobar",
+<code>C</code> does not change <code>foo</code>, but its merge <code>N</code> changes it to "foobar",
so it is not TREESAME to any parent.
</p>
</li>
<li>
<p>
-<tt>D</tt> sets <tt>foo</tt> to "baz". Its merge <tt>O</tt> combines the strings from
- <tt>N</tt> and <tt>D</tt> to "foobarbaz"; i.e., it is not TREESAME to any parent.
+<code>D</code> sets <code>foo</code> to "baz". Its merge <code>O</code> combines the strings from
+ <code>N</code> and <code>D</code> to "foobarbaz"; i.e., it is not TREESAME to any parent.
</p>
</li>
<li>
<p>
-<tt>E</tt> changes <tt>quux</tt> to "xyzzy", and its merge <tt>P</tt> combines the
- strings to "quux xyzzy". Despite appearing interesting, <tt>P</tt> is
+<code>E</code> changes <code>quux</code> to "xyzzy", and its merge <code>P</code> combines the
+ strings to "quux xyzzy". Despite appearing interesting, <code>P</code> is
TREESAME to all parents.
</p>
</li>
@@ -1257,14 +1430,14 @@ Default mode <div class="paragraph"><p>This results in:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> .-A---N---O
+<pre><code> .-A---N---O
/ / /
- I---------D</tt></pre>
+ I---------D</code></pre>
</div></div>
<div class="paragraph"><p>Note how the rule to only follow the TREESAME parent, if one is
-available, removed <tt>B</tt> from consideration entirely. <tt>C</tt> was
-considered via <tt>N</tt>, but is TREESAME. Root commits are compared to an
-empty tree, so <tt>I</tt> is !TREESAME.</p></div>
+available, removed <code>B</code> from consideration entirely. <code>C</code> was
+considered via <code>N</code>, but is TREESAME. Root commits are compared to an
+empty tree, so <code>I</code> is !TREESAME.</p></div>
<div class="paragraph"><p>Parent/child relations are only visible with --parents, but that does
not affect the commits selected in default mode, so we have shown the
parent lines.</p></div>
@@ -1282,10 +1455,10 @@ parent lines.</p></div> </p>
<div class="listingblock">
<div class="content">
-<pre><tt> I A B N D O</tt></pre>
+<pre><code> I A B N D O</code></pre>
</div></div>
-<div class="paragraph"><p><tt>P</tt> and <tt>M</tt> were excluded because they are TREESAME to a parent. <tt>E</tt>,
-<tt>C</tt> and <tt>B</tt> were all walked, but only <tt>B</tt> was !TREESAME, so the others
+<div class="paragraph"><p><code>P</code> and <code>M</code> were excluded because they are TREESAME to a parent. <code>E</code>,
+<code>C</code> and <code>B</code> were all walked, but only <code>B</code> was !TREESAME, so the others
do not appear.</p></div>
<div class="paragraph"><p>Note that without parent rewriting, it is not really possible to talk
about the parent/child relationships between the commits, so we show
@@ -1304,16 +1477,16 @@ Along each parent, prune away commits that are not included themselves. This results in</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> .-A---M---N---O---P
+<pre><code> .-A---M---N---O---P
/ / / / /
I B / D /
\ / / / /
- `-------------'</tt></pre>
+ `-------------'</code></pre>
</div></div>
-<div class="paragraph"><p>Compare to <em>--full-history</em> without rewriting above. Note that <tt>E</tt>
+<div class="paragraph"><p>Compare to <em>--full-history</em> without rewriting above. Note that <code>E</code>
was pruned away because it is TREESAME, but the parent list of P was
-rewritten to contain <tt>E</tt>'s parent <tt>I</tt>. The same happened for <tt>C</tt> and
-<tt>N</tt>. Note also that <tt>P</tt> was included despite being TREESAME.</p></div>
+rewritten to contain <code>E</code>'s parent <code>I</code>. The same happened for <code>C</code> and
+<code>N</code>. Note also that <code>P</code> was included despite being TREESAME.</p></div>
</dd>
</dl></div>
<div class="paragraph"><p>In addition to the above settings, you can change whether TREESAME
@@ -1347,54 +1520,60 @@ sides of the merge are never walked.</p></div> First, build a history graph in the same way that
<em>--full-history</em> with parent rewriting does (see above).
</p>
-<div class="paragraph"><p>Then simplify each commit <tt>C</tt> to its replacement <tt>C'</tt> in the final
+<div class="paragraph"><p>Then simplify each commit <code>C</code> to its replacement <code>C'</code> in the final
history according to the following rules:</p></div>
+<div class="openblock">
+<div class="content">
<div class="ulist"><ul>
<li>
<p>
-Set <tt>C'</tt> to <tt>C</tt>.
+Set <code>C'</code> to <code>C</code>.
</p>
</li>
<li>
<p>
-Replace each parent <tt>P</tt> of <tt>C'</tt> with its simplification <tt>P'</tt>. In
+Replace each parent <code>P</code> of <code>C'</code> with its simplification <code>P'</code>. In
the process, drop parents that are ancestors of other parents, and
remove duplicates.
</p>
</li>
<li>
<p>
-If after this parent rewriting, <tt>C'</tt> is a root or merge commit (has
+If after this parent rewriting, <code>C'</code> is a root or merge commit (has
zero or >1 parents), a boundary commit, or !TREESAME, it remains.
Otherwise, it is replaced with its only parent.
</p>
</li>
</ul></div>
+</div></div>
<div class="paragraph"><p>The effect of this is best shown by way of comparing to
<em>--full-history</em> with parent rewriting. The example turns into:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> .-A---M---N---O
+<pre><code> .-A---M---N---O
/ / /
I B D
\ / /
- `---------'</tt></pre>
+ `---------'</code></pre>
</div></div>
-<div class="paragraph"><p>Note the major differences in <tt>N</tt> and <tt>P</tt> over <em>--full-history</em>:</p></div>
+<div class="paragraph"><p>Note the major differences in <code>N</code> and <code>P</code> over <em>--full-history</em>:</p></div>
+<div class="openblock">
+<div class="content">
<div class="ulist"><ul>
<li>
<p>
-<tt>N</tt>'s parent list had <tt>I</tt> removed, because it is an ancestor of the
- other parent <tt>M</tt>. Still, <tt>N</tt> remained because it is !TREESAME.
+<code>N</code>'s parent list had <code>I</code> removed, because it is an ancestor of the
+ other parent <code>M</code>. Still, <code>N</code> remained because it is !TREESAME.
</p>
</li>
<li>
<p>
-<tt>P</tt>'s parent list similarly had <tt>I</tt> removed. <tt>P</tt> was then
+<code>P</code>'s parent list similarly had <code>I</code> removed. <code>P</code> was then
removed completely, because it had one parent and is TREESAME.
</p>
</li>
</ul></div>
+</div></div>
</dd>
</dl></div>
<div class="paragraph"><p>Finally, there is a fifth simplification mode available:</p></div>
@@ -1412,30 +1591,30 @@ If after this parent rewriting, <tt>C'</tt> is a root or merge commit (has <div class="paragraph"><p>As an example use case, consider the following commit history:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> D---E-------F
+<pre><code> D---E-------F
/ \ \
B---C---G---H---I---J
/ \
- A-------K---------------L--M</tt></pre>
+ A-------K---------------L--M</code></pre>
</div></div>
-<div class="paragraph"><p>A regular <em>D..M</em> computes the set of commits that are ancestors of <tt>M</tt>,
-but excludes the ones that are ancestors of <tt>D</tt>. This is useful to see
-what happened to the history leading to <tt>M</tt> since <tt>D</tt>, in the sense
-that "what does <tt>M</tt> have that did not exist in <tt>D</tt>". The result in this
-example would be all the commits, except <tt>A</tt> and <tt>B</tt> (and <tt>D</tt> itself,
+<div class="paragraph"><p>A regular <em>D..M</em> computes the set of commits that are ancestors of <code>M</code>,
+but excludes the ones that are ancestors of <code>D</code>. This is useful to see
+what happened to the history leading to <code>M</code> since <code>D</code>, in the sense
+that "what does <code>M</code> have that did not exist in <code>D</code>". The result in this
+example would be all the commits, except <code>A</code> and <code>B</code> (and <code>D</code> itself,
of course).</p></div>
-<div class="paragraph"><p>When we want to find out what commits in <tt>M</tt> are contaminated with the
-bug introduced by <tt>D</tt> and need fixing, however, we might want to view
-only the subset of <em>D..M</em> that are actually descendants of <tt>D</tt>, i.e.
-excluding <tt>C</tt> and <tt>K</tt>. This is exactly what the <em>--ancestry-path</em>
+<div class="paragraph"><p>When we want to find out what commits in <code>M</code> are contaminated with the
+bug introduced by <code>D</code> and need fixing, however, we might want to view
+only the subset of <em>D..M</em> that are actually descendants of <code>D</code>, i.e.
+excluding <code>C</code> and <code>K</code>. This is exactly what the <em>--ancestry-path</em>
option does. Applied to the <em>D..M</em> range, it results in:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> E-------F
+<pre><code> E-------F
\ \
G---H---I---J
\
- L--M</tt></pre>
+ L--M</code></pre>
</div></div>
</dd>
</dl></div>
@@ -1446,7 +1625,9 @@ that are not referenced by tags. Commits are marked as !TREESAME above) if (1) they are referenced by tags, or (2) they change the
contents of the paths given on the command line. All other
commits are marked as TREESAME (subject to be simplified away).</p></div>
-<h3 id="_commit_ordering">Commit Ordering</h3><div style="clear:left"></div>
+</div>
+<div class="sect2">
+<h3 id="_commit_ordering">Commit Ordering</h3>
<div class="paragraph"><p>By default, the commits are shown in reverse chronological order.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
@@ -1470,14 +1651,14 @@ commits are marked as TREESAME (subject to be simplified away).</p></div> <div class="paragraph"><p>For example, in a commit history like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> ---1----2----4----7
+<pre><code> ---1----2----4----7
\ \
- 3----5----6----8---</tt></pre>
+ 3----5----6----8---</code></pre>
</div></div>
-<div class="paragraph"><p>where the numbers denote the order of commit timestamps, <tt>git
-rev-list</tt> and friends with <tt>--date-order</tt> show the commits in the
+<div class="paragraph"><p>where the numbers denote the order of commit timestamps, <code>git
+rev-list</code> and friends with <code>--date-order</code> show the commits in the
timestamp order: 8 7 6 5 4 3 2 1.</p></div>
-<div class="paragraph"><p>With <tt>--topo-order</tt>, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5
+<div class="paragraph"><p>With <code>--topo-order</code>, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5
3 1); some older commits are shown before newer ones in order to
avoid showing the commits from two parallel development track mixed
together.</p></div>
@@ -1492,7 +1673,9 @@ together.</p></div> </p>
</dd>
</dl></div>
-<h3 id="_object_traversal">Object Traversal</h3><div style="clear:left"></div>
+</div>
+<div class="sect2">
+<h3 id="_object_traversal">Object Traversal</h3>
<div class="paragraph"><p>These options are mostly targeted for packing of git repositories.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
@@ -1549,7 +1732,9 @@ together.</p></div> </p>
</dd>
</dl></div>
-<h3 id="_commit_formatting">Commit Formatting</h3><div style="clear:left"></div>
+</div>
+<div class="sect2">
+<h3 id="_commit_formatting">Commit Formatting</h3>
<div class="dlist"><dl>
<dt class="hdlist1">
--pretty[=<format>]
@@ -1587,7 +1772,7 @@ people using 80-column terminals.</p></div> <dd>
<p>
Show the full 40-byte hexadecimal commit object name. This negates
- <tt>--abbrev-commit</tt> and those options which imply it such as
+ <code>--abbrev-commit</code> and those options which imply it such as
"--oneline". It also overrides the <em>log.abbrevCommit</em> variable.
</p>
</dd>
@@ -1619,15 +1804,15 @@ people using 80-column terminals.</p></div> <p>
Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the
commit, when showing the commit log message. This is the default
- for <tt>git log</tt>, <tt>git show</tt> and <tt>git whatchanged</tt> commands when
- there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option given
+ for <code>git log</code>, <code>git show</code> and <code>git whatchanged</code> commands when
+ there is no <code>--pretty</code>, <code>--format</code> nor <code>--oneline</code> option given
on the command line.
</p>
<div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the
<em>core.notesRef</em> and <em>notes.displayRef</em> variables (or corresponding
environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
<div class="paragraph"><p>With an optional <em><ref></em> argument, show this notes ref instead of the
-default notes ref(s). The ref is taken to be in <tt>refs/notes/</tt> if it
+default notes ref(s). The ref is taken to be in <code>refs/notes/</code> if it
is not qualified.</p></div>
<div class="paragraph"><p>Multiple --notes options can be combined to control which notes are
being displayed. Examples: "--notes=foo" will show only notes from
@@ -1639,7 +1824,7 @@ being displayed. Examples: "--notes=foo" will show only notes from </dt>
<dd>
<p>
- Do not show notes. This negates the above <tt>--notes</tt> option, by
+ Do not show notes. This negates the above <code>--notes</code> option, by
resetting the list of notes refs from which notes are shown.
Options are parsed in the order given on the command line, so e.g.
"--notes --notes=foo --no-notes --notes=bar" will only show notes
@@ -1664,7 +1849,7 @@ being displayed. Examples: "--notes=foo" will show only notes from <dd>
<p>
Check the validity of a signed commit object by passing the signature
- to <tt>gpg --verify</tt> and show the output.
+ to <code>gpg --verify</code> and show the output.
</p>
</dd>
<dt class="hdlist1">
@@ -1672,7 +1857,7 @@ being displayed. Examples: "--notes=foo" will show only notes from </dt>
<dd>
<p>
- Synonym for <tt>--date=relative</tt>.
+ Synonym for <code>--date=relative</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1681,18 +1866,18 @@ being displayed. Examples: "--notes=foo" will show only notes from <dd>
<p>
Only takes effect for dates shown in human-readable format, such
- as when using "--pretty". <tt>log.date</tt> config variable sets a default
+ as when using "--pretty". <code>log.date</code> config variable sets a default
value for log command’s --date option.
</p>
-<div class="paragraph"><p><tt>--date=relative</tt> shows dates relative to the current time,
+<div class="paragraph"><p><code>--date=relative</code> shows dates relative to the current time,
e.g. "2 hours ago".</p></div>
-<div class="paragraph"><p><tt>--date=local</tt> shows timestamps in user’s local timezone.</p></div>
-<div class="paragraph"><p><tt>--date=iso</tt> (or <tt>--date=iso8601</tt>) shows timestamps in ISO 8601 format.</p></div>
-<div class="paragraph"><p><tt>--date=rfc</tt> (or <tt>--date=rfc2822</tt>) shows timestamps in RFC 2822
+<div class="paragraph"><p><code>--date=local</code> shows timestamps in user’s local timezone.</p></div>
+<div class="paragraph"><p><code>--date=iso</code> (or <code>--date=iso8601</code>) shows timestamps in ISO 8601 format.</p></div>
+<div class="paragraph"><p><code>--date=rfc</code> (or <code>--date=rfc2822</code>) shows timestamps in RFC 2822
format, often found in E-mail messages.</p></div>
-<div class="paragraph"><p><tt>--date=short</tt> shows only date but not time, in <tt>YYYY-MM-DD</tt> format.</p></div>
-<div class="paragraph"><p><tt>--date=raw</tt> shows the date in the internal raw git format <tt>%s %z</tt> format.</p></div>
-<div class="paragraph"><p><tt>--date=default</tt> shows timestamps in the original timezone
+<div class="paragraph"><p><code>--date=short</code> shows only date but not time, in <code>YYYY-MM-DD</code> format.</p></div>
+<div class="paragraph"><p><code>--date=raw</code> shows the date in the internal raw git format <code>%s %z</code> format.</p></div>
+<div class="paragraph"><p><code>--date=default</code> shows timestamps in the original timezone
(either committer’s or author’s).</p></div>
</dd>
<dt class="hdlist1">
@@ -1719,30 +1904,30 @@ format, often found in E-mail messages.</p></div> <dd>
<p>
Mark which side of a symmetric diff a commit is reachable from.
- Commits from the left side are prefixed with <tt><</tt> and those from
- the right with <tt>></tt>. If combined with <tt>--boundary</tt>, those
- commits are prefixed with <tt>-</tt>.
+ Commits from the left side are prefixed with <code><</code> and those from
+ the right with <code>></code>. If combined with <code>--boundary</code>, those
+ commits are prefixed with <code>-</code>.
</p>
<div class="paragraph"><p>For example, if you have this topology:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> y---b---b branch B
+<pre><code> y---b---b branch B
/ \ /
/ .
/ / \
- o---x---a---a branch A</tt></pre>
+ o---x---a---a branch A</code></pre>
</div></div>
<div class="paragraph"><p>you would get an output like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> $ git rev-list --left-right --boundary --pretty=oneline A...B
+<pre><code> $ git rev-list --left-right --boundary --pretty=oneline A...B
>bbbbbbb... 3rd on b
>bbbbbbb... 2nd on b
<aaaaaaa... 3rd on a
<aaaaaaa... 2nd on a
-yyyyyyy... 1st on b
- -xxxxxxx... 1st on a</tt></pre>
+ -xxxxxxx... 1st on a</code></pre>
</div></div>
</dd>
<dt class="hdlist1">
@@ -1760,7 +1945,9 @@ format, often found in E-mail messages.</p></div> <em>--date-order</em> option may also be specified.</p></div>
</dd>
</dl></div>
-<h3 id="_diff_formatting">Diff Formatting</h3><div style="clear:left"></div>
+</div>
+<div class="sect2">
+<h3 id="_diff_formatting">Diff Formatting</h3>
<div class="paragraph"><p>Below are listed options that control the formatting of diff output.
Some of them are specific to <a href="git-rev-list.html">git-rev-list(1)</a>, however other diff
options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> for more options.</p></div>
@@ -1827,6 +2014,9 @@ options may be given. See <a href="git-diff-files.html">git-diff-files(1)</a> fo </dd>
</dl></div>
</div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_pretty_formats">PRETTY FORMATS</h2>
<div class="sectionbody">
<div class="paragraph"><p>If the commit is a merge, and if the pretty-format
@@ -1851,7 +2041,7 @@ built-in formats:</p></div> </p>
<div class="literalblock">
<div class="content">
-<pre><tt><sha1> <title line></tt></pre>
+<pre><code><sha1> <title line></code></pre>
</div></div>
<div class="paragraph"><p>This is designed to be as compact as possible.</p></div>
</li>
@@ -1861,12 +2051,12 @@ built-in formats:</p></div> </p>
<div class="literalblock">
<div class="content">
-<pre><tt>commit <sha1>
-Author: <author></tt></pre>
+<pre><code>commit <sha1>
+Author: <author></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><title line></tt></pre>
+<pre><code><title line></code></pre>
</div></div>
</li>
<li>
@@ -1875,17 +2065,17 @@ Author: <author></tt></pre> </p>
<div class="literalblock">
<div class="content">
-<pre><tt>commit <sha1>
+<pre><code>commit <sha1>
Author: <author>
-Date: <author date></tt></pre>
+Date: <author date></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><title line></tt></pre>
+<pre><code><title line></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><full commit message></tt></pre>
+<pre><code><full commit message></code></pre>
</div></div>
</li>
<li>
@@ -1894,17 +2084,17 @@ Date: <author date></tt></pre> </p>
<div class="literalblock">
<div class="content">
-<pre><tt>commit <sha1>
+<pre><code>commit <sha1>
Author: <author>
-Commit: <committer></tt></pre>
+Commit: <committer></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><title line></tt></pre>
+<pre><code><title line></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><full commit message></tt></pre>
+<pre><code><full commit message></code></pre>
</div></div>
</li>
<li>
@@ -1913,19 +2103,19 @@ Commit: <committer></tt></pre> </p>
<div class="literalblock">
<div class="content">
-<pre><tt>commit <sha1>
+<pre><code>commit <sha1>
Author: <author>
AuthorDate: <author date>
Commit: <committer>
-CommitDate: <committer date></tt></pre>
+CommitDate: <committer date></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><title line></tt></pre>
+<pre><code><title line></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><full commit message></tt></pre>
+<pre><code><full commit message></code></pre>
</div></div>
</li>
<li>
@@ -1934,14 +2124,14 @@ CommitDate: <committer date></tt></pre> </p>
<div class="literalblock">
<div class="content">
-<pre><tt>From <sha1> <date>
+<pre><code>From <sha1> <date>
From: <author>
Date: <author date>
-Subject: [PATCH] <title line></tt></pre>
+Subject: [PATCH] <title line></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><full commit message></tt></pre>
+<pre><code><full commit message></code></pre>
</div></div>
</li>
<li>
@@ -1967,8 +2157,8 @@ instead of <em>\n</em>.</p></div> would show something like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago
-The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</tt></pre>
+<pre><code>The author of fe6e0ee was Junio C Hamano, 23 hours ago
+The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</code></pre>
</div></div>
<div class="paragraph"><p>The placeholders are:</p></div>
<div class="ulist"><ul>
@@ -2144,12 +2334,12 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff </li>
<li>
<p>
-<em>%gD</em>: reflog selector, e.g., <tt>refs/stash@{1}</tt>
+<em>%gD</em>: reflog selector, e.g., <code>refs/stash@{1}</code>
</p>
</li>
<li>
<p>
-<em>%gd</em>: shortened reflog selector, e.g., <tt>stash@{1}</tt>
+<em>%gd</em>: shortened reflog selector, e.g., <code>stash@{1}</code>
</p>
</li>
<li>
@@ -2237,16 +2427,16 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff <div class="title">Note</div>
</td>
<td class="content">Some placeholders may depend on other options given to the
-revision traversal engine. For example, the <tt>%g*</tt> reflog options will
+revision traversal engine. For example, the <code>%g*</code> reflog options will
insert an empty string unless we are traversing reflog entries (e.g., by
-<tt>git log -g</tt>). The <tt>%d</tt> placeholder will use the "short" decoration
-format if <tt>--decorate</tt> was not already provided on the command line.</td>
+<code>git log -g</code>). The <code>%d</code> placeholder will use the "short" decoration
+format if <code>--decorate</code> was not already provided on the command line.</td>
</tr></table>
</div>
-<div class="paragraph"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
+<div class="paragraph"><p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.</p></div>
-<div class="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
+<div class="paragraph"><p>If you add a <code>-</code> (minus sign) after <em>%</em> of a placeholder, line-feeds that
immediately precede the expansion are deleted if and only if the
placeholder expands to an empty string.</p></div>
<div class="paragraph"><p>If you add a ` ` (space) after <em>%</em> of a placeholder, a space
@@ -2266,7 +2456,7 @@ terminated with a new line, just as the "oneline" format does. For example:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git log -2 --pretty=format:%h 4da45bef \
+<pre><code>$ git log -2 --pretty=format:%h 4da45bef \
| perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
4da45be
7134973 -- NO NEWLINE
@@ -2274,19 +2464,21 @@ For example:</p></div> $ git log -2 --pretty=tformat:%h 4da45bef \
| perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
4da45be
-7134973</tt></pre>
+7134973</code></pre>
</div></div>
-<div class="paragraph"><p>In addition, any unrecognized string that has a <tt>%</tt> in it is interpreted
-as if it has <tt>tformat:</tt> in front of it. For example, these two are
+<div class="paragraph"><p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted
+as if it has <code>tformat:</code> in front of it. For example, these two are
equivalent:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git log -2 --pretty=tformat:%h 4da45bef
-$ git log -2 --pretty=%h 4da45bef</tt></pre>
+<pre><code>$ git log -2 --pretty=tformat:%h 4da45bef
+$ git log -2 --pretty=%h 4da45bef</code></pre>
</div></div>
</li>
</ul></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_common_diff_options">Common diff options</h2>
<div class="sectionbody">
<div class="dlist"><dl>
@@ -2315,7 +2507,7 @@ $ git log -2 --pretty=%h 4da45bef</tt></pre> <p>
Generate diffs with <n> lines of context instead of
the usual three.
- Implies <tt>-p</tt>.
+ Implies <code>-p</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -2332,7 +2524,7 @@ $ git log -2 --pretty=%h 4da45bef</tt></pre> </dt>
<dd>
<p>
- Synonym for <tt>-p --raw</tt>.
+ Synonym for <code>-p --raw</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -2369,29 +2561,29 @@ $ git log -2 --pretty=%h 4da45bef</tt></pre> will be used for the filename part, and the rest for the graph
part. Maximum width defaults to terminal width, or 80 columns
if not connected to a terminal, and can be overridden by
- <tt><width></tt>. The width of the filename part can be limited by
- giving another width <tt><name-width></tt> after a comma. The width
+ <code><width></code>. The width of the filename part can be limited by
+ giving another width <code><name-width></code> after a comma. The width
of the graph part can be limited by using
- <tt>--stat-graph-width=<width></tt> (affects all commands generating
- a stat graph) or by setting <tt>diff.statGraphWidth=<width></tt>
- (does not affect <tt>git format-patch</tt>).
- By giving a third parameter <tt><count></tt>, you can limit the
- output to the first <tt><count></tt> lines, followed by <tt>...</tt> if
+ <code>--stat-graph-width=<width></code> (affects all commands generating
+ a stat graph) or by setting <code>diff.statGraphWidth=<width></code>
+ (does not affect <code>git format-patch</code>).
+ By giving a third parameter <code><count></code>, you can limit the
+ output to the first <code><count></code> lines, followed by <code>...</code> if
there are more.
</p>
-<div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=<width></tt>,
-<tt>--stat-name-width=<name-width></tt> and <tt>--stat-count=<count></tt>.</p></div>
+<div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=<width></code>,
+<code>--stat-name-width=<name-width></code> and <code>--stat-count=<count></code>.</p></div>
</dd>
<dt class="hdlist1">
--numstat
</dt>
<dd>
<p>
- Similar to <tt>--stat</tt>, but shows number of added and
+ Similar to <code>--stat</code>, but shows number of added and
deleted lines in decimal notation and pathname without
abbreviation, to make it more machine friendly. For
- binary files, outputs two <tt>-</tt> instead of saying
- <tt>0 0</tt>.
+ binary files, outputs two <code>-</code> instead of saying
+ <code>0 0</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -2399,7 +2591,7 @@ $ git log -2 --pretty=%h 4da45bef</tt></pre> </dt>
<dd>
<p>
- Output only the last line of the <tt>--stat</tt> format containing total
+ Output only the last line of the <code>--stat</code> format containing total
number of modified files, as well as number of added and deleted
lines.
</p>
@@ -2410,15 +2602,17 @@ $ git log -2 --pretty=%h 4da45bef</tt></pre> <dd>
<p>
Output the distribution of relative amount of changes for each
- sub-directory. The behavior of <tt>--dirstat</tt> can be customized by
+ sub-directory. The behavior of <code>--dirstat</code> can be customized by
passing it a comma separated list of parameters.
- The defaults are controlled by the <tt>diff.dirstat</tt> configuration
+ The defaults are controlled by the <code>diff.dirstat</code> configuration
variable (see <a href="git-config.html">git-config(1)</a>).
The following parameters are available:
</p>
+<div class="openblock">
+<div class="content">
<div class="dlist"><dl>
<dt class="hdlist1">
-<tt>changes</tt>
+<code>changes</code>
</dt>
<dd>
<p>
@@ -2430,39 +2624,39 @@ $ git log -2 --pretty=%h 4da45bef</tt></pre> </p>
</dd>
<dt class="hdlist1">
-<tt>lines</tt>
+<code>lines</code>
</dt>
<dd>
<p>
Compute the dirstat numbers by doing the regular line-based diff
analysis, and summing the removed/added line counts. (For binary
files, count 64-byte chunks instead, since binary files have no
- natural concept of lines). This is a more expensive <tt>--dirstat</tt>
- behavior than the <tt>changes</tt> behavior, but it does count rearranged
+ natural concept of lines). This is a more expensive <code>--dirstat</code>
+ behavior than the <code>changes</code> behavior, but it does count rearranged
lines within a file as much as other changes. The resulting output
- is consistent with what you get from the other <tt>--*stat</tt> options.
+ is consistent with what you get from the other <code>--*stat</code> options.
</p>
</dd>
<dt class="hdlist1">
-<tt>files</tt>
+<code>files</code>
</dt>
<dd>
<p>
Compute the dirstat numbers by counting the number of files changed.
Each changed file counts equally in the dirstat analysis. This is
- the computationally cheapest <tt>--dirstat</tt> behavior, since it does
+ the computationally cheapest <code>--dirstat</code> behavior, since it does
not have to look at the file contents at all.
</p>
</dd>
<dt class="hdlist1">
-<tt>cumulative</tt>
+<code>cumulative</code>
</dt>
<dd>
<p>
Count changes in a child directory for the parent directory as well.
- Note that when using <tt>cumulative</tt>, the sum of the percentages
+ Note that when using <code>cumulative</code>, the sum of the percentages
reported may exceed 100%. The default (non-cumulative) behavior can
- be specified with the <tt>noncumulative</tt> parameter.
+ be specified with the <code>noncumulative</code> parameter.
</p>
</dd>
<dt class="hdlist1">
@@ -2476,10 +2670,11 @@ $ git log -2 --pretty=%h 4da45bef</tt></pre> </p>
</dd>
</dl></div>
+</div></div>
<div class="paragraph"><p>Example: The following will count changed files, while ignoring
directories with less than 10% of the total amount of changed files,
and accumulating child directory counts in the parent directories:
-<tt>--dirstat=files,10,cumulative</tt>.</p></div>
+<code>--dirstat=files,10,cumulative</code>.</p></div>
</dd>
<dt class="hdlist1">
--summary
@@ -2495,7 +2690,7 @@ and accumulating child directory counts in the parent directories: </dt>
<dd>
<p>
- Synonym for <tt>-p --stat</tt>.
+ Synonym for <code>-p --stat</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -2505,10 +2700,10 @@ and accumulating child directory counts in the parent directories: <p>
Separate the commits with NULs instead of with new newlines.
</p>
-<div class="paragraph"><p>Also, when <tt>--raw</tt> or <tt>--numstat</tt> has been given, do not munge
+<div class="paragraph"><p>Also, when <code>--raw</code> or <code>--numstat</code> has been given, do not munge
pathnames and use NULs as output field terminators.</p></div>
<div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
-and backslash characters replaced with <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt>, and <tt>\\</tt>,
+and backslash characters replaced with <code>\t</code>, <code>\n</code>, <code>\"</code>, and <code>\\</code>,
respectively, and the pathname will be enclosed in double quotes if
any of those replacements occurred.</p></div>
</dd>
@@ -2526,7 +2721,7 @@ any of those replacements occurred.</p></div> <dd>
<p>
Show only names and status of changed files. See the description
- of the <tt>--diff-filter</tt> option on what the status letters mean.
+ of the <code>--diff-filter</code> option on what the status letters mean.
</p>
</dd>
<dt class="hdlist1">
@@ -2534,13 +2729,13 @@ any of those replacements occurred.</p></div> </dt>
<dd>
<p>
- Specify how differences in submodules are shown. When <tt>--submodule</tt>
- or <tt>--submodule=log</tt> is given, the <em>log</em> format is used. This format lists
- the commits in the range like <a href="git-submodule.html">git-submodule(1)</a> <tt>summary</tt> does.
- Omitting the <tt>--submodule</tt> option or specifying <tt>--submodule=short</tt>,
+ Specify how differences in submodules are shown. When <code>--submodule</code>
+ or <code>--submodule=log</code> is given, the <em>log</em> format is used. This format lists
+ the commits in the range like <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does.
+ Omitting the <code>--submodule</code> option or specifying <code>--submodule=short</code>,
uses the <em>short</em> format. This format just shows the names of the commits
at the beginning and end of the range. Can be tweaked via the
- <tt>diff.submodule</tt> configuration variable.
+ <code>diff.submodule</code> configuration variable.
</p>
</dd>
<dt class="hdlist1">
@@ -2549,8 +2744,8 @@ any of those replacements occurred.</p></div> <dd>
<p>
Show colored diff.
- The value must be <tt>always</tt> (the default for <tt><when></tt>), <tt>never</tt>, or <tt>auto</tt>.
- The default value is <tt>never</tt>.
+ The value must be <code>always</code> (the default for <code><when></code>), <code>never</code>, or <code>auto</code>.
+ The default value is <code>never</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -2559,7 +2754,7 @@ any of those replacements occurred.</p></div> <dd>
<p>
Turn off colored diff.
- It is the same as <tt>--color=never</tt>.
+ It is the same as <code>--color=never</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -2569,16 +2764,18 @@ any of those replacements occurred.</p></div> <p>
Show a word diff, using the <mode> to delimit changed words.
By default, words are delimited by whitespace; see
- <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
+ <code>--word-diff-regex</code> below. The <mode> defaults to <em>plain</em>, and
must be one of:
</p>
+<div class="openblock">
+<div class="content">
<div class="dlist"><dl>
<dt class="hdlist1">
color
</dt>
<dd>
<p>
- Highlight changed words using only colors. Implies <tt>--color</tt>.
+ Highlight changed words using only colors. Implies <code>--color</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -2586,7 +2783,7 @@ plain </dt>
<dd>
<p>
- Show words as <tt>[-removed-]</tt> and <tt>{+added+}</tt>. Makes no
+ Show words as <code>[-removed-]</code> and <code>{+added+}</code>. Makes no
attempts to escape the delimiters if they appear in the input,
so the output may be ambiguous.
</p>
@@ -2598,10 +2795,10 @@ porcelain <p>
Use a special line-based format intended for script
consumption. Added/removed/unchanged runs are printed in the
- usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
+ usual unified diff format, starting with a <code>+</code>/<code>-</code>/` `
character at the beginning of the line and extending to the
end of the line. Newlines in the input are represented by a
- tilde <tt>~</tt> on a line of its own.
+ tilde <code>~</code> on a line of its own.
</p>
</dd>
<dt class="hdlist1">
@@ -2613,6 +2810,7 @@ none </p>
</dd>
</dl></div>
+</div></div>
<div class="paragraph"><p>Note that despite the name of the first mode, color is used to
highlight the changed parts in all modes if enabled.</p></div>
</dd>
@@ -2623,12 +2821,12 @@ highlight the changed parts in all modes if enabled.</p></div> <p>
Use <regex> to decide what a word is, instead of considering
runs of non-whitespace to be a word. Also implies
- <tt>--word-diff</tt> unless it was already enabled.
+ <code>--word-diff</code> unless it was already enabled.
</p>
<div class="paragraph"><p>Every non-overlapping match of the
<regex> is considered a word. Anything between these matches is
considered whitespace and ignored(!) for the purposes of finding
-differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
+differences. You may want to append <code>|[^[:space:]]</code> to your regular
expression to make sure that it matches all non-whitespace characters.
A match that contains a newline is silently truncated(!) at the
newline.</p></div>
@@ -2642,8 +2840,8 @@ override configuration settings.</p></div> </dt>
<dd>
<p>
- Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
- specified) <tt>--word-diff-regex=<regex></tt>.
+ Equivalent to <code>--word-diff=color</code> plus (if a regex was
+ specified) <code>--word-diff-regex=<regex></code>.
</p>
</dd>
<dt class="hdlist1">
@@ -2661,7 +2859,7 @@ override configuration settings.</p></div> <dd>
<p>
Warn if changes introduce whitespace errors. What are
- considered whitespace errors is controlled by <tt>core.whitespace</tt>
+ considered whitespace errors is controlled by <code>core.whitespace</code>
configuration. By default, trailing whitespaces (including
lines that solely consist of whitespaces) and a space character
that is immediately followed by a tab character inside the
@@ -2685,8 +2883,8 @@ override configuration settings.</p></div> </dt>
<dd>
<p>
- In addition to <tt>--full-index</tt>, output a binary diff that
- can be applied with <tt>git-apply</tt>.
+ In addition to <code>--full-index</code>, output a binary diff that
+ can be applied with <code>git-apply</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -2697,9 +2895,9 @@ override configuration settings.</p></div> Instead of showing the full 40-byte hexadecimal object
name in diff-raw format output and diff-tree header
lines, show only a partial prefix. This is
- independent of the <tt>--full-index</tt> option above, which controls
+ independent of the <code>--full-index</code> option above, which controls
the diff-patch output format. Non default number of
- digits can be specified with <tt>--abbrev=<n></tt>.
+ digits can be specified with <code>--abbrev=<n></code>.
</p>
</dd>
<dt class="hdlist1">
@@ -2717,15 +2915,15 @@ override configuration settings.</p></div> not as a series of deletion and insertion mixed together with a very
few lines that happen to match textually as the context, but as a
single deletion of everything old followed by a single insertion of
-everything new, and the number <tt>m</tt> controls this aspect of the -B
-option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
+everything new, and the number <code>m</code> controls this aspect of the -B
+option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
original should remain in the result for git to consider it a total
rewrite (i.e. otherwise the resulting patch will be a series of
deletion and insertion mixed together with context lines).</p></div>
<div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
source of a rename (usually -M only considers a file that disappeared
-as the source of a rename), and the number <tt>n</tt> controls this aspect of
-the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
+as the source of a rename), and the number <code>n</code> controls this aspect of
+the -B option (defaults to 50%). <code>-B20%</code> specifies that a change with
addition and deletion compared to 20% or more of the file’s size are
eligible for being picked up as a possible source of a rename to
another file.</p></div>
@@ -2740,12 +2938,16 @@ another file.</p></div> <p>
If generating diffs, detect and report renames for each commit.
For following files across renames while traversing history, see
- <tt>--follow</tt>.
- If <tt>n</tt> is specified, it is a threshold on the similarity
+ <code>--follow</code>.
+ If <code>n</code> is specified, it is a threshold on the similarity
index (i.e. amount of addition/deletions compared to the
- file’s size). For example, <tt>-M90%</tt> means git should consider a
+ file’s size). For example, <code>-M90%</code> means git should consider a
delete/add pair to be a rename if more than 90% of the file
- hasn’t changed.
+ hasn’t changed. Without a <code>%</code> sign, the number is to be read as
+ a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
+ 0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
+ the same as <code>-M5%</code>. To limit detection to exact renames, use
+ <code>-M100%</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -2756,8 +2958,8 @@ another file.</p></div> </dt>
<dd>
<p>
- Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
- If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
+ Detect copies as well as renames. See also <code>--find-copies-harder</code>.
+ If <code>n</code> is specified, it has the same meaning as for <code>-M<n></code>.
</p>
</dd>
<dt class="hdlist1">
@@ -2765,13 +2967,13 @@ another file.</p></div> </dt>
<dd>
<p>
- For performance reasons, by default, <tt>-C</tt> option finds copies only
+ For performance reasons, by default, <code>-C</code> option finds copies only
if the original file of the copy was modified in the same
changeset. This flag makes the command
inspect unmodified files as candidates for the source of
copy. This is a very expensive operation for large
projects, so use it with caution. Giving more than one
- <tt>-C</tt> option has the same effect.
+ <code>-C</code> option has the same effect.
</p>
</dd>
<dt class="hdlist1">
@@ -2783,14 +2985,14 @@ another file.</p></div> <dd>
<p>
Omit the preimage for deletes, i.e. print only the header but not
- the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
- is not meant to be applied with <tt>patch</tt> nor <tt>git apply</tt>; this is
+ the diff between the preimage and <code>/dev/null</code>. The resulting patch
+ is not meant to be applied with <code>patch</code> nor <code>git apply</code>; this is
solely for people who want to just concentrate on reviewing the
text after the change. In addition, the output obviously lack
enough information to apply such a patch in reverse, even manually,
hence the name of the option.
</p>
-<div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
+<div class="paragraph"><p>When used together with <code>-B</code>, omit also the preimage in the deletion part
of a delete/create pair.</p></div>
</dd>
<dt class="hdlist1">
@@ -2798,7 +3000,7 @@ of a delete/create pair.</p></div> </dt>
<dd>
<p>
- The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
+ The <code>-M</code> and <code>-C</code> options require O(n^2) processing time where n
is the number of potential rename/copy targets. This
option prevents rename/copy detection from running if
the number of rename/copy targets exceeds the specified
@@ -2810,13 +3012,13 @@ of a delete/create pair.</p></div> </dt>
<dd>
<p>
- Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
- Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
- type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
- are Unmerged (<tt>U</tt>), are
- Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
+ Select only files that are Added (<code>A</code>), Copied (<code>C</code>),
+ Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their
+ type (i.e. regular file, symlink, submodule, …) changed (<code>T</code>),
+ are Unmerged (<code>U</code>), are
+ Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>).
Any combination of the filter characters (including none) can be used.
- When <tt>*</tt> (All-or-none) is added to the combination, all
+ When <code>*</code> (All-or-none) is added to the combination, all
paths are selected if there is any file that matches
other criteria in the comparison; if there is no file
that matches other criteria, nothing is selected.
@@ -2847,7 +3049,7 @@ of a delete/create pair.</p></div> </dt>
<dd>
<p>
- When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
+ When <code>-S</code> or <code>-G</code> finds a change, show all the changes in that
changeset, not just the files that contain the change
in <string>.
</p>
@@ -3039,6 +3241,8 @@ of a delete/create pair.</p></div> <div class="paragraph"><p>For more detailed explanation on these common options, see also
<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_generating_patches_with_p">Generating patches with -p</h2>
<div class="sectionbody">
<div class="paragraph"><p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
@@ -3056,12 +3260,12 @@ It is preceded with a "git diff" header that looks like this: </p>
<div class="literalblock">
<div class="content">
-<pre><tt>diff --git a/file1 b/file2</tt></pre>
+<pre><code>diff --git a/file1 b/file2</code></pre>
</div></div>
-<div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
+<div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
involved. Especially, even for a creation or a deletion,
-<tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
-<div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
+<code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
+<div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the
name of the source file of the rename/copy and the name of
the file that rename/copy produces, respectively.</p></div>
</li>
@@ -3071,7 +3275,7 @@ It is followed by one or more extended header lines: </p>
<div class="literalblock">
<div class="content">
-<pre><tt>old mode <mode>
+<pre><code>old mode <mode>
new mode <mode>
deleted file mode <mode>
new file mode <mode>
@@ -3081,11 +3285,11 @@ rename from <path> rename to <path>
similarity index <number>
dissimilarity index <number>
-index <hash>..<hash> <mode></tt></pre>
+index <hash>..<hash> <mode></code></pre>
</div></div>
<div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
and file permission bits.</p></div>
-<div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
+<div class="paragraph"><p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p></div>
<div class="paragraph"><p>The similarity index is the percentage of unchanged lines, and
the dissimilarity index is the percentage of changed lines. It
is a rounded down integer, followed by a percent sign. The
@@ -3099,33 +3303,35 @@ separate lines indicate the old and the new mode.</p></div> <li>
<p>
TAB, LF, double quote and backslash characters in pathnames
- are represented as <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt> and <tt>\\</tt>, respectively.
+ are represented as <code>\t</code>, <code>\n</code>, <code>\"</code> and <code>\\</code>, respectively.
If there is need for such substitution then the whole
pathname is put in double quotes.
</p>
</li>
<li>
<p>
-All the <tt>file1</tt> files in the output refer to files before the
- commit, and all the <tt>file2</tt> files refer to files after the commit.
+All the <code>file1</code> files in the output refer to files before the
+ commit, and all the <code>file2</code> files refer to files after the commit.
It is incorrect to apply each change to each file sequentially. For
example, this patch will swap a and b:
</p>
<div class="literalblock">
<div class="content">
-<pre><tt>diff --git a/a b/b
+<pre><code>diff --git a/a b/b
rename from a
rename to b
diff --git a/b b/a
rename from b
-rename to a</tt></pre>
+rename to a</code></pre>
</div></div>
</li>
</ol></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_combined_diff_format">combined diff format</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
+<div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <code>--cc</code> option to
produce a <em>combined diff</em> when showing a merge. This is the default
format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
<a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
@@ -3134,7 +3340,7 @@ of a merge.</p></div> <div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>diff --combined describe.c
+<pre><code>diff --combined describe.c
index fabadb8,cc95eb0..4866510
--- a/describe.c
+++ b/describe.c
@@ -3160,7 +3366,7 @@ index fabadb8,cc95eb0..4866510 +
if (!initialized) {
initialized = 1;
- for_each_ref(get_name);</tt></pre>
+ for_each_ref(get_name);</code></pre>
</div></div>
<div class="olist arabic"><ol class="arabic">
<li>
@@ -3170,12 +3376,12 @@ It is preceded with a "git diff" header, that looks like </p>
<div class="literalblock">
<div class="content">
-<pre><tt>diff --combined file</tt></pre>
+<pre><code>diff --combined file</code></pre>
</div></div>
<div class="paragraph"><p>or like this (when <em>--cc</em> option is used):</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>diff --cc file</tt></pre>
+<pre><code>diff --cc file</code></pre>
</div></div>
</li>
<li>
@@ -3185,12 +3391,12 @@ It is followed by one or more extended header lines </p>
<div class="literalblock">
<div class="content">
-<pre><tt>index <hash>,<hash>..<hash>
+<pre><code>index <hash>,<hash>..<hash>
mode <mode>,<mode>..<mode>
new file mode <mode>
-deleted file mode <mode>,<mode></tt></pre>
+deleted file mode <mode>,<mode></code></pre>
</div></div>
-<div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
+<div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
the <mode> is different from the rest. Extended headers with
information about detected contents movement (renames and
copying detection) are designed to work with diff of two
@@ -3202,58 +3408,60 @@ It is followed by two-line from-file/to-file header </p>
<div class="literalblock">
<div class="content">
-<pre><tt>--- a/file
-+++ b/file</tt></pre>
+<pre><code>--- a/file
++++ b/file</code></pre>
</div></div>
<div class="paragraph"><p>Similar to two-line header for traditional <em>unified</em> diff
-format, <tt>/dev/null</tt> is used to signal created or deleted
+format, <code>/dev/null</code> is used to signal created or deleted
files.</p></div>
</li>
<li>
<p>
Chunk header format is modified to prevent people from
- accidentally feeding it to <tt>patch -p1</tt>. Combined diff format
+ accidentally feeding it to <code>patch -p1</code>. Combined diff format
was created for review of merge commit changes, and was not
meant for apply. The change is similar to the change in the
extended <em>index</em> header:
</p>
<div class="literalblock">
<div class="content">
-<pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
+<pre><code>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</code></pre>
</div></div>
-<div class="paragraph"><p>There are (number of parents + 1) <tt>@</tt> characters in the chunk
+<div class="paragraph"><p>There are (number of parents + 1) <code>@</code> characters in the chunk
header for combined diff format.</p></div>
</li>
</ol></div>
<div class="paragraph"><p>Unlike the traditional <em>unified</em> diff format, which shows two
-files A and B with a single column that has <tt>-</tt> (minus — appears in A but removed in B), <tt>+</tt> (plus — missing in A but
-added to B), or <tt>" "</tt> (space — unchanged) prefix, this format
+files A and B with a single column that has <code>-</code> (minus — appears in A but removed in B), <code>+</code> (plus — missing in A but
+added to B), or <code>" "</code> (space — unchanged) prefix, this format
compares two or more files file1, file2,… with one file X, and
shows how X differs from each of fileN. One column for each of
fileN is prepended to the output line to note how X’s line is
different from it.</p></div>
-<div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
-fileN but it does not appear in the result. A <tt>+</tt> character
+<div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
+fileN but it does not appear in the result. A <code>+</code> character
in the column N means that the line appears in the result,
and fileN does not have that line (in other words, the line was
added, from the point of view of that parent).</p></div>
<div class="paragraph"><p>In the above example output, the function signature was changed
-from both files (hence two <tt>-</tt> removals from both file1 and
-file2, plus <tt>++</tt> to mean one line that was added does not appear
+from both files (hence two <code>-</code> removals from both file1 and
+file2, plus <code>++</code> to mean one line that was added does not appear
in either file1 nor file2). Also eight other lines are the same
-from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div>
-<div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
+from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
+<div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
-parents). When shown by <tt>git diff-files -c</tt>, it compares the
+parents). When shown by <code>git diff-files -c</code>, it compares the
two unresolved merge parents with the working tree file
(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
"their version").</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_examples">Examples</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
-<tt>git log --no-merges</tt>
+<code>git log --no-merges</code>
</dt>
<dd>
<p>
@@ -3261,7 +3469,7 @@ two unresolved merge parents with the working tree file </p>
</dd>
<dt class="hdlist1">
-<tt>git log v2.6.12.. include/scsi drivers/scsi</tt>
+<code>git log v2.6.12.. include/scsi drivers/scsi</code>
</dt>
<dd>
<p>
@@ -3270,7 +3478,7 @@ two unresolved merge parents with the working tree file </p>
</dd>
<dt class="hdlist1">
-<tt>git log --since="2 weeks ago" -- gitk</tt>
+<code>git log --since="2 weeks ago" -- gitk</code>
</dt>
<dd>
<p>
@@ -3280,7 +3488,7 @@ two unresolved merge parents with the working tree file </p>
</dd>
<dt class="hdlist1">
-<tt>git log --name-status release..test</tt>
+<code>git log --name-status release..test</code>
</dt>
<dd>
<p>
@@ -3290,7 +3498,7 @@ two unresolved merge parents with the working tree file </p>
</dd>
<dt class="hdlist1">
-<tt>git log --follow builtin-rev-list.c</tt>
+<code>git log --follow builtin-rev-list.c</code>
</dt>
<dd>
<p>
@@ -3300,7 +3508,7 @@ two unresolved merge parents with the working tree file </p>
</dd>
<dt class="hdlist1">
-<tt>git log --branches --not --remotes=origin</tt>
+<code>git log --branches --not --remotes=origin</code>
</dt>
<dd>
<p>
@@ -3310,7 +3518,7 @@ two unresolved merge parents with the working tree file </p>
</dd>
<dt class="hdlist1">
-<tt>git log master --not --remotes=*/master</tt>
+<code>git log master --not --remotes=*/master</code>
</dt>
<dd>
<p>
@@ -3319,7 +3527,7 @@ two unresolved merge parents with the working tree file </p>
</dd>
<dt class="hdlist1">
-<tt>git log -p -m --first-parent</tt>
+<code>git log -p -m --first-parent</code>
</dt>
<dd>
<p>
@@ -3331,7 +3539,7 @@ two unresolved merge parents with the working tree file </p>
</dd>
<dt class="hdlist1">
-<tt>git log -3</tt>
+<code>git log -3</code>
</dt>
<dd>
<p>
@@ -3340,6 +3548,8 @@ two unresolved merge parents with the working tree file </dd>
</dl></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_discussion">Discussion</h2>
<div class="sectionbody">
<div class="paragraph"><p>At the core level, git is character encoding agnostic.</p></div>
@@ -3381,33 +3591,33 @@ mind.</p></div> a warning if the commit log message given to it does not look
like a valid UTF-8 string, unless you explicitly say your
project uses a legacy encoding. The way to say this is to
- have i18n.commitencoding in <tt>.git/config</tt> file, like this:
+ have i18n.commitencoding in <code>.git/config</code> file, like this:
</p>
<div class="listingblock">
<div class="content">
-<pre><tt>[i18n]
- commitencoding = ISO-8859-1</tt></pre>
+<pre><code>[i18n]
+ commitencoding = ISO-8859-1</code></pre>
</div></div>
<div class="paragraph"><p>Commit objects created with the above setting record the value
-of <tt>i18n.commitencoding</tt> in its <tt>encoding</tt> header. This is to
+of <code>i18n.commitencoding</code> in its <code>encoding</code> header. This is to
help other people who look at them later. Lack of this header
implies that the commit log message is encoded in UTF-8.</p></div>
</li>
<li>
<p>
<em>git log</em>, <em>git show</em>, <em>git blame</em> and friends look at the
- <tt>encoding</tt> header of a commit object, and try to re-code the
+ <code>encoding</code> header of a commit object, and try to re-code the
log message into UTF-8 unless otherwise specified. You can
specify the desired output encoding with
- <tt>i18n.logoutputencoding</tt> in <tt>.git/config</tt> file, like this:
+ <code>i18n.logoutputencoding</code> in <code>.git/config</code> file, like this:
</p>
<div class="listingblock">
<div class="content">
-<pre><tt>[i18n]
- logoutputencoding = ISO-8859-1</tt></pre>
+<pre><code>[i18n]
+ logoutputencoding = ISO-8859-1</code></pre>
</div></div>
<div class="paragraph"><p>If you do not have this configuration variable, the value of
-<tt>i18n.commitencoding</tt> is used instead.</p></div>
+<code>i18n.commitencoding</code> is used instead.</p></div>
</li>
</ol></div>
<div class="paragraph"><p>Note that we deliberately chose not to re-code the commit log
@@ -3415,6 +3625,8 @@ message when a commit is made to force UTF-8 at the commit object level, because re-coding to UTF-8 is not necessarily a
reversible operation.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_configuration">Configuration</h2>
<div class="sectionbody">
<div class="paragraph"><p>See <a href="git-config.html">git-config(1)</a> for core variables and <a href="git-diff.html">git-diff(1)</a>
@@ -3425,7 +3637,7 @@ format.pretty </dt>
<dd>
<p>
- Default for the <tt>--format</tt> option. (See "PRETTY FORMATS" above.)
+ Default for the <code>--format</code> option. (See "PRETTY FORMATS" above.)
Defaults to "medium".
</p>
</dd>
@@ -3435,7 +3647,7 @@ i18n.logOutputEncoding <dd>
<p>
Encoding to use when displaying logs. (See "Discussion", above.)
- Defaults to the value of <tt>i18n.commitEncoding</tt> if set, UTF-8
+ Defaults to the value of <code>i18n.commitEncoding</code> if set, UTF-8
otherwise.
</p>
</dd>
@@ -3445,8 +3657,8 @@ log.date <dd>
<p>
Default format for human-readable dates. (Compare the
- <tt>--date</tt> option.) Defaults to "default", which means to write
- dates like <tt>Sat May 8 19:35:34 2010 -0500</tt>.
+ <code>--date</code> option.) Defaults to "default", which means to write
+ dates like <code>Sat May 8 19:35:34 2010 -0500</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -3454,10 +3666,10 @@ log.showroot </dt>
<dd>
<p>
- If <tt>false</tt>, <em>git log</em> and related commands will not treat the
+ If <code>false</code>, <em>git log</em> and related commands will not treat the
initial commit as a big creation event. Any root commits in
- <tt>git log -p</tt> output would be shown without a diff attached.
- The default is <tt>true</tt>.
+ <code>git log -p</code> output would be shown without a diff attached.
+ The default is <code>true</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -3473,7 +3685,7 @@ notes.displayRef </dt>
<dd>
<p>
- Which refs, in addition to the default set by <tt>core.notesRef</tt>
+ Which refs, in addition to the default set by <code>core.notesRef</code>
or <em>GIT_NOTES_REF</em>, to read notes from when showing commit
messages with the <em>log</em> family of commands. See
<a href="git-notes.html">git-notes(1)</a>.
@@ -3481,17 +3693,20 @@ notes.displayRef <div class="paragraph"><p>May be an unabbreviated ref name or a glob and may be specified
multiple times. A warning will be issued for refs that do not exist,
but a glob that does not match any refs is silently ignored.</p></div>
-<div class="paragraph"><p>This setting can be disabled by the <tt>--no-notes</tt> option,
+<div class="paragraph"><p>This setting can be disabled by the <code>--no-notes</code> option,
overridden by the <em>GIT_NOTES_DISPLAY_REF</em> environment variable,
-and overridden by the <tt>--notes=<ref></tt> option.</p></div>
+and overridden by the <code>--notes=<ref></code> option.</p></div>
</dd>
</dl></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
</div>
+</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
|