diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 15:32:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 15:32:51 -0700 |
| commit | ac12f0ed6289c50e645af6dfb6e063776bc0f428 (patch) | |
| tree | 9033ab4b78ce9c9122fbe9b5abcf23d596ea24fd /git-rev-list.html | |
| parent | c3f8d8ffe5fd51ed0a3dae59dd8b78f61d7b43d2 (diff) | |
| download | git-htmldocs-ac12f0ed6289c50e645af6dfb6e063776bc0f428.tar.gz | |
Autogenerated HTML docs for v2.1.1-273-g97b886
Diffstat (limited to 'git-rev-list.html')
| -rw-r--r-- | git-rev-list.html | 524 |
1 files changed, 276 insertions, 248 deletions
diff --git a/git-rev-list.html b/git-rev-list.html index 849ba3e9b..d02109509 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -3,7 +3,7 @@ <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 8.6.6" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
<title>git-rev-list(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,10 +87,16 @@ ul, ol, li > p { 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;
}
+pre {
+ white-space: pre-wrap;
+}
#author {
color: #527bbd;
@@ -219,7 +225,7 @@ div.exampleblock > div.content { }
div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
+span.image img { border-style: none; vertical-align: text-bottom; }
a.image:visited { color: white; }
dl {
@@ -349,7 +355,7 @@ div.colist td img { 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;
}
@@ -407,18 +413,14 @@ 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
*
* */
-tt {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
div.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -452,12 +454,6 @@ div.tableblock > table[frame="vsides"] { *
* */
-.monospaced {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
table.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -537,6 +533,8 @@ body.manpage div.sectionbody { @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).
@@ -610,7 +608,7 @@ toc: function (toclevels) { var i;
for (i = 0; i < toc.childNodes.length; i++) {
var entry = toc.childNodes[i];
- if (entry.nodeName == 'div'
+ if (entry.nodeName.toLowerCase() == 'div'
&& entry.getAttribute("class")
&& entry.getAttribute("class").match(/^toclevel/))
tocEntriesToRemove.push(entry);
@@ -656,7 +654,7 @@ footnotes: function () { var entriesToRemove = [];
for (i = 0; i < noteholder.childNodes.length; i++) {
var entry = noteholder.childNodes[i];
- if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote")
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
entriesToRemove.push(entry);
}
for (i = 0; i < entriesToRemove.length; i++) {
@@ -786,7 +784,7 @@ git-rev-list(1) Manual Page [ --regexp-ignore-case | -i ]
[ --extended-regexp | -E ]
[ --fixed-strings | -F ]
- [ --date=(local|relative|default|iso|rfc|short) ]
+ [ --date=(local|relative|default|iso|iso-strict|rfc|short) ]
[ [--objects | --objects-edge] [ --unpacked ] ]
[ --pretty | --header ]
[ --bisect ]
@@ -805,7 +803,7 @@ git-rev-list(1) Manual Page <div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>List commits that are reachable by following the <tt>parent</tt> links from the
+<div class="paragraph"><p>List commits that are reachable by following the <code>parent</code> links from the
given commit(s), but exclude commits that are reachable from the one(s)
given with a <em>^</em> in front of them. The output is given in reverse
chronological order by default.</p></div>
@@ -818,7 +816,7 @@ to further limit the result.</p></div> <div class="paragraph"><p>Thus, the following command:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> $ git rev-list foo bar ^baz</tt></pre>
+<pre><code> $ git rev-list foo bar ^baz</code></pre>
</div></div>
<div class="paragraph"><p>means "list all the commits which are reachable from <em>foo</em> or <em>bar</em>, but
not from <em>baz</em>".</p></div>
@@ -827,16 +825,16 @@ short-hand for "^'<commit1>' <em><commit2></em>". For example, e the following may be used interchangeably:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> $ git rev-list origin..HEAD
- $ git rev-list HEAD ^origin</tt></pre>
+<pre><code> $ git rev-list origin..HEAD
+ $ git rev-list HEAD ^origin</code></pre>
</div></div>
<div class="paragraph"><p>Another special notation is "<em><commit1></em>…<em><commit2></em>" which is useful
for merges. The resulting set of commits is the symmetric difference
between the two operands. The following two commands are equivalent:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> $ git rev-list A B --not $(git merge-base --all A B)
- $ git rev-list A...B</tt></pre>
+<pre><code> $ git rev-list A B --not $(git merge-base --all A B)
+ $ git rev-list A...B</code></pre>
</div></div>
<div class="paragraph"><p><em>rev-list</em> is a very essential Git command, since it
provides the ability to build and traverse commit ancestry graphs. For
@@ -854,11 +852,11 @@ used by commands as different as <em>git bisect</em> and 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>
@@ -927,9 +925,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">
@@ -939,9 +937,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">
@@ -951,11 +949,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">
@@ -963,7 +961,7 @@ if it is part of the log message.</p></div> </dt>
<dd>
<p>
- Limit the commits output to ones that match all given <tt>--grep</tt>,
+ Limit the commits output to ones that match all given <code>--grep</code>,
instead of ones that match at least one.
</p>
</dd>
@@ -1034,7 +1032,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">
@@ -1043,7 +1041,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">
@@ -1061,13 +1059,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 parent
- 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
@@ -1089,7 +1087,7 @@ parents) and <tt>--max-parents=-1</tt> (negative numbers denote no upper limit). <dd>
<p>
Reverses the meaning of the <em>^</em> prefix (or lack thereof)
- for all following revision specifiers, up to the next <tt>--not</tt>.
+ for all following revision specifiers, up to the next <code>--not</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1097,7 +1095,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>
@@ -1106,7 +1104,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.
@@ -1117,7 +1115,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.
@@ -1128,7 +1126,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.
@@ -1150,17 +1148,17 @@ parents) and <tt>--max-parents=-1</tt> (negative numbers denote no upper limit). </dt>
<dd>
<p>
- Do not include refs matching <em><glob-pattern></em> that the next <tt>--all</tt>,
- <tt>--branches</tt>, <tt>--tags</tt>, <tt>--remotes</tt>, or <tt>--glob</tt> would otherwise
+ Do not include refs matching <em><glob-pattern></em> that the next <code>--all</code>,
+ <code>--branches</code>, <code>--tags</code>, <code>--remotes</code>, or <code>--glob</code> would otherwise
consider. Repetitions of this option accumulate exclusion patterns
- up to the next <tt>--all</tt>, <tt>--branches</tt>, <tt>--tags</tt>, <tt>--remotes</tt>, or
- <tt>--glob</tt> option (other options or arguments do not clear
+ up to the next <code>--all</code>, <code>--branches</code>, <code>--tags</code>, <code>--remotes</code>, or
+ <code>--glob</code> option (other options or arguments do not clear
accumlated patterns).
</p>
-<div class="paragraph"><p>The patterns given should not begin with <tt>refs/heads</tt>, <tt>refs/tags</tt>, or
-<tt>refs/remotes</tt> when applied to <tt>--branches</tt>, <tt>--tags</tt>, or <tt>--remotes</tt>,
-respectively, and they must begin with <tt>refs/</tt> when applied to <tt>--glob</tt>
-or <tt>--all</tt>. If a trailing <em>/*</em> is intended, it must be given
+<div class="paragraph"><p>The patterns given should not begin with <code>refs/heads</code>, <code>refs/tags</code>, or
+<code>refs/remotes</code> when applied to <code>--branches</code>, <code>--tags</code>, or <code>--remotes</code>,
+respectively, and they must begin with <code>refs/</code> when applied to <code>--glob</code>
+or <code>--all</code>. If a trailing <em>/*</em> is intended, it must be given
explicitly.</p></div>
</dd>
<dt class="hdlist1">
@@ -1192,7 +1190,7 @@ explicitly.</p></div> is primarily meant to allow the caller to
test the exit status to see if a range of objects is fully
connected (or not). It is faster than redirecting stdout
- to <tt>/dev/null</tt> as the output does not have to be formatted.
+ to <code>/dev/null</code> as the output does not have to be formatted.
</p>
</dd>
<dt class="hdlist1">
@@ -1200,8 +1198,8 @@ explicitly.</p></div> </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">
@@ -1213,10 +1211,10 @@ explicitly.</p></div> 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). However, it shows the commits that were
+<code>--left-right</code> (see the example below in the description of
+the <code>--left-right</code> option). However, it 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>
@@ -1230,13 +1228,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">
@@ -1244,11 +1242,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">
@@ -1265,14 +1263,14 @@ list.</p></div> exclude (that is, <em>^commit</em>, <em>commit1..commit2</em>,
and <em>commit1...commit2</em> notations cannot be used).
</p>
-<div class="paragraph"><p>With <tt>--pretty</tt> format other than <tt>oneline</tt> (for obvious reasons),
+<div class="paragraph"><p>With <code>--pretty</code> format other than <code>oneline</code> (for obvious reasons),
this causes the output to have two extra lines of information
taken from the reflog. By default, <em>commit@{Nth}</em> notation is
used in the output. When the starting commit is specified as
<em>commit@{now}</em>, output also uses <em>commit@{timestamp}</em> notation
-instead. Under <tt>--pretty=oneline</tt>, the commit message is
+instead. Under <code>--pretty=oneline</code>, the commit message is
prefixed with this information on the same line.
-This option cannot be combined with <tt>--reverse</tt>.
+This option cannot be combined with <code>--reverse</code>.
See also <a href="git-reflog.html">git-reflog(1)</a>.</p></div>
</dd>
<dt class="hdlist1">
@@ -1290,7 +1288,7 @@ See also <a href="git-reflog.html">git-reflog(1)</a>.</p></div> <dd>
<p>
Output excluded boundary commits. Boundary commits are
- prefixed with <tt>-</tt>.
+ prefixed with <code>-</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1299,7 +1297,7 @@ See also <a href="git-reflog.html">git-reflog(1)</a>.</p></div> <dd>
<p>
Try to speed up the traversal using the pack bitmap index (if
- one is available). Note that when traversing with <tt>--objects</tt>,
+ one is available). Note that when traversing with <code>--objects</code>,
trees and blobs will not have their associated path printed.
</p>
</dd>
@@ -1375,7 +1373,7 @@ Default mode </dt>
<dd>
<p>
- Additional option to <tt>--full-history</tt> to remove some needless
+ Additional option to <code>--full-history</code> to remove some needless
merges from the resulting history, as there are no selected
commits contributing to this merge.
</p>
@@ -1394,70 +1392,70 @@ 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---Q
+<pre><code> .-A---M---N---O---P---Q
/ / / / / /
I B C D E Y
\ / / / / /
- `-------------' X</tt></pre>
+ `-------------' X</code></pre>
</div></div>
<div class="paragraph"><p>The horizontal line of history A---Q 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”. <tt>P</tt> is TREESAME to <tt>O</tt>, but not to <tt>E</tt>.
+<code>E</code> changes <code>quux</code> to “xyzzy”, and its merge <code>P</code> combines the
+ strings to “quux xyzzy”. <code>P</code> is TREESAME to <code>O</code>, but not to <code>E</code>.
</p>
</li>
<li>
<p>
-<tt>X</tt> is an independent root commit that added a new file <tt>side</tt>, and <tt>Y</tt>
- modified it. <tt>Y</tt> is TREESAME to <tt>X</tt>. Its merge <tt>Q</tt> added <tt>side</tt> to <tt>P</tt>, and
- <tt>Q</tt> is TREESAME to <tt>P</tt>, but not to <tt>Y</tt>.
+<code>X</code> is an independent root commit that added a new file <code>side</code>, and <code>Y</code>
+ modified it. <code>Y</code> is TREESAME to <code>X</code>. Its merge <code>Q</code> added <code>side</code> to <code>P</code>, and
+ <code>Q</code> is TREESAME to <code>P</code>, but not to <code>Y</code>.
</p>
</li>
</ul></div>
-<div class="paragraph"><p><tt>rev-list</tt> walks backwards through history, including or excluding
-commits based on whether <tt>--full-history</tt> and/or parent rewriting
-(via <tt>--parents</tt> or <tt>--children</tt>) are used. The following settings
+<div class="paragraph"><p><code>rev-list</code> walks backwards through history, including or excluding
+commits based on whether <code>--full-history</code> and/or parent rewriting
+(via <code>--parents</code> or <code>--children</code>) are used. The following settings
are available.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
@@ -1466,7 +1464,7 @@ Default mode <dd>
<p>
Commits are included if they are not TREESAME to any parent
- (though this can be changed, see <tt>--sparse</tt> below). If the
+ (though this can be changed, see <code>--sparse</code> below). If the
commit was a merge, and it was TREESAME to one parent, follow
only that parent. (Even if there are several TREESAME
parents, follow only one of them.) Otherwise, follow all
@@ -1475,15 +1473,15 @@ 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>
-<div class="paragraph"><p>Parent/child relations are only visible with <tt>--parents</tt>, but that does
+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 <code>--parents</code>, but that does
not affect the commits selected in default mode, so we have shown the
parent lines.</p></div>
</dd>
@@ -1500,10 +1498,10 @@ parent lines.</p></div> </p>
<div class="listingblock">
<div class="content">
-<pre><tt> I A B N D O P Q</tt></pre>
+<pre><code> I A B N D O P Q</code></pre>
</div></div>
-<div class="paragraph"><p><tt>M</tt> was excluded because it is TREESAME to both parents. <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>M</code> was excluded because it is TREESAME to both parents. <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
@@ -1515,23 +1513,23 @@ them disconnected.</p></div> <dd>
<p>
Ordinary commits are only included if they are !TREESAME
- (though this can be changed, see <tt>--sparse</tt> below).
+ (though this can be changed, see <code>--sparse</code> below).
</p>
<div class="paragraph"><p>Merges are always included. However, their parent list is rewritten:
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---Q
+<pre><code> .-A---M---N---O---P---Q
/ / / / /
I B / D /
\ / / / /
- `-------------'</tt></pre>
+ `-------------'</code></pre>
</div></div>
-<div class="paragraph"><p>Compare to <tt>--full-history</tt> without rewriting above. Note that <tt>E</tt>
+<div class="paragraph"><p>Compare to <code>--full-history</code> 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>, and <tt>X</tt>, <tt>Y</tt> and <tt>Q</tt>.</p></div>
+rewritten to contain <code>E</code>'s parent <code>I</code>. The same happened for <code>C</code> and
+<code>N</code>, and <code>X</code>, <code>Y</code> and <code>Q</code>.</p></div>
</dd>
</dl></div>
<div class="paragraph"><p>In addition to the above settings, you can change whether TREESAME
@@ -1553,7 +1551,7 @@ affects inclusion:</p></div> <p>
All commits that are walked are included.
</p>
-<div class="paragraph"><p>Note that without <tt>--full-history</tt>, this still simplifies merges: if
+<div class="paragraph"><p>Note that without <code>--full-history</code>, this still simplifies merges: if
one of the parents is TREESAME, we follow only that one, so the other
sides of the merge are never walked.</p></div>
</dd>
@@ -1563,21 +1561,21 @@ sides of the merge are never walked.</p></div> <dd>
<p>
First, build a history graph in the same way that
- <tt>--full-history</tt> with parent rewriting does (see above).
+ <code>--full-history</code> 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 or that are
root commits TREESAME to an empty tree, and remove duplicates, but take care
to never drop all parents that we are TREESAME to.
@@ -1585,7 +1583,7 @@ Replace each parent <tt>P</tt> of <tt>C'</tt> with its simplification <tt>P'</tt </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>
@@ -1593,35 +1591,35 @@ If after this parent rewriting, <tt>C'</tt> is a root or merge commit (has </ul></div>
</div></div>
<div class="paragraph"><p>The effect of this is best shown by way of comparing to
-<tt>--full-history</tt> with parent rewriting. The example turns into:</p></div>
+<code>--full-history</code> 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>, <tt>P</tt>, and <tt>Q</tt> over <tt>--full-history</tt>:</p></div>
+<div class="paragraph"><p>Note the major differences in <code>N</code>, <code>P</code>, and <code>Q</code> over <code>--full-history</code>:</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>
<li>
<p>
-<tt>Q</tt>'s parent list had <tt>Y</tt> simplified to <tt>X</tt>. <tt>X</tt> was then removed, because it
- was a TREESAME root. <tt>Q</tt> was then removed completely, because it had one
+<code>Q</code>'s parent list had <code>Y</code> simplified to <code>X</code>. <code>X</code> was then removed, because it
+ was a TREESAME root. <code>Q</code> was then removed completely, because it had one
parent and is TREESAME.
</p>
</li>
@@ -1644,34 +1642,34 @@ 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 <tt>--ancestry-path</tt>
+<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 <code>--ancestry-path</code>
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>
-<div class="paragraph"><p>The <tt>--simplify-by-decoration</tt> option allows you to view only the
+<div class="paragraph"><p>The <code>--simplify-by-decoration</code> option allows you to view only the
big picture of the topology of the history, by omitting commits
that are not referenced by tags. Commits are marked as !TREESAME
(in other words, kept after history simplification rules described
@@ -1689,20 +1687,20 @@ commits are marked as TREESAME (subject to be simplified away).</p></div> <p>
Limit output to the one commit object which is roughly halfway between
included and excluded commits. Note that the bad bisection ref
- <tt>refs/bisect/bad</tt> is added to the included commits (if it
- exists) and the good bisection refs <tt>refs/bisect/good-*</tt> are
+ <code>refs/bisect/bad</code> is added to the included commits (if it
+ exists) and the good bisection refs <code>refs/bisect/good-*</code> are
added to the excluded commits (if they exist). Thus, supposing there
- are no refs in <tt>refs/bisect/</tt>, if
+ are no refs in <code>refs/bisect/</code>, if
</p>
<div class="listingblock">
<div class="content">
-<pre><tt> $ git rev-list --bisect foo ^bar ^baz</tt></pre>
+<pre><code> $ git rev-list --bisect foo ^bar ^baz</code></pre>
</div></div>
<div class="paragraph"><p>outputs <em>midpoint</em>, the output of the two commands</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> $ git rev-list foo ^midpoint
- $ git rev-list midpoint ^bar ^baz</tt></pre>
+<pre><code> $ git rev-list foo ^midpoint
+ $ git rev-list midpoint ^bar ^baz</code></pre>
</div></div>
<div class="paragraph"><p>would be of roughly the same length. Finding the change which
introduces a regression is thus reduced to a binary search: repeatedly
@@ -1714,16 +1712,16 @@ one.</p></div> </dt>
<dd>
<p>
- This calculates the same as <tt>--bisect</tt>, except that refs in
- <tt>refs/bisect/</tt> are not used, and except that this outputs
+ This calculates the same as <code>--bisect</code>, except that refs in
+ <code>refs/bisect/</code> are not used, and except that this outputs
text ready to be eval’ed by the shell. These lines will assign the
- name of the midpoint revision to the variable <tt>bisect_rev</tt>, and the
- expected number of commits to be tested after <tt>bisect_rev</tt> is tested
- to <tt>bisect_nr</tt>, the expected number of commits to be tested if
- <tt>bisect_rev</tt> turns out to be good to <tt>bisect_good</tt>, the expected
- number of commits to be tested if <tt>bisect_rev</tt> turns out to be bad to
- <tt>bisect_bad</tt>, and the number of commits we are bisecting right now to
- <tt>bisect_all</tt>.
+ name of the midpoint revision to the variable <code>bisect_rev</code>, and the
+ expected number of commits to be tested after <code>bisect_rev</code> is tested
+ to <code>bisect_nr</code>, the expected number of commits to be tested if
+ <code>bisect_rev</code> turns out to be good to <code>bisect_good</code>, the expected
+ number of commits to be tested if <code>bisect_rev</code> turns out to be bad to
+ <code>bisect_bad</code>, and the number of commits we are bisecting right now to
+ <code>bisect_all</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1733,16 +1731,16 @@ one.</p></div> <p>
This outputs all the commit objects between the included and excluded
commits, ordered by their distance to the included and excluded
- commits. Refs in <tt>refs/bisect/</tt> are not used. The farthest
+ commits. Refs in <code>refs/bisect/</code> are not used. The farthest
from them is displayed first. (This is the only one displayed by
- <tt>--bisect</tt>.)
+ <code>--bisect</code>.)
</p>
<div class="paragraph"><p>This is useful because it makes it easy to choose a good commit to
test when you want to avoid to test some of them for some reason (they
may not compile for example).</p></div>
-<div class="paragraph"><p>This option can be used along with <tt>--bisect-vars</tt>, in this case,
+<div class="paragraph"><p>This option can be used along with <code>--bisect-vars</code>, in this case,
after all the sorted commit objects, there will be the same text as if
-<tt>--bisect-vars</tt> had been used alone.</p></div>
+<code>--bisect-vars</code> had been used alone.</p></div>
</dd>
</dl></div>
</div>
@@ -1780,14 +1778,14 @@ after all the sorted commit objects, there will be the same text as if <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>
@@ -1798,7 +1796,7 @@ together.</p></div> <dd>
<p>
Output the commits in reverse order.
- Cannot be combined with <tt>--walk-reflogs</tt>.
+ Cannot be combined with <code>--walk-reflogs</code>.
</p>
</dd>
</dl></div>
@@ -1813,7 +1811,7 @@ together.</p></div> <dd>
<p>
Print the object IDs of any object referenced by the listed
- commits. <tt>--objects foo ^bar</tt> thus means “send me
+ commits. <code>--objects foo ^bar</code> thus means “send me
all object IDs which I need to download if I have the commit
object <em>bar</em> but not <em>foo</em>”.
</p>
@@ -1823,7 +1821,7 @@ together.</p></div> </dt>
<dd>
<p>
- Similar to <tt>--objects</tt>, but also print the IDs of excluded
+ Similar to <code>--objects</code>, but also print the IDs of excluded
commits prefixed with a “-” character. This is used by
<a href="git-pack-objects.html">git-pack-objects(1)</a> to build “thin” pack, which records
objects in deltified form based on objects contained in these
@@ -1835,7 +1833,7 @@ together.</p></div> </dt>
<dd>
<p>
- Only useful with <tt>--objects</tt>; print the object IDs that are not
+ Only useful with <code>--objects</code>; print the object IDs that are not
in packs.
</p>
</dd>
@@ -1846,8 +1844,8 @@ together.</p></div> <p>
Only show the given commits, but do not traverse their ancestors.
This has no effect if a range is specified. If the argument
- <tt>unsorted</tt> is given, the commits are shown in the order they were
- given on the command line. Otherwise (if <tt>sorted</tt> or no argument
+ <code>unsorted</code> is given, the commits are shown in the order they were
+ given on the command line. Otherwise (if <code>sorted</code> or no argument
was given), the commits are shown in reverse chronological order
by commit time.
</p>
@@ -1857,7 +1855,7 @@ together.</p></div> </dt>
<dd>
<p>
- Overrides a previous <tt>--no-walk</tt>.
+ Overrides a previous <code>--no-walk</code>.
</p>
</dd>
</dl></div>
@@ -1904,7 +1902,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>
@@ -1936,15 +1934,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>, or <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>, or <code>--oneline</code> option given
on the command line.
</p>
<div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the
<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
@@ -1956,7 +1954,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
@@ -1981,7 +1979,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">
@@ -1989,27 +1987,47 @@ 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">
---date=(relative|local|default|iso|rfc|short|raw)
+--date=(relative|local|default|iso|iso-strict|rfc|short|raw)
</dt>
<dd>
<p>
Only takes effect for dates shown in human-readable format, such
- as when using <tt>--pretty</tt>. <tt>log.date</tt> config variable sets a default
- value for the log command’s <tt>--date</tt> option.
+ as when using <code>--pretty</code>. <code>log.date</code> config variable sets a default
+ value for the log command’s <code>--date</code> 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 time zone.</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 time zone.</p></div>
+<div class="paragraph"><p><code>--date=iso</code> (or <code>--date=iso8601</code>) shows timestamps in a ISO 8601-like format.
+The differences to the strict ISO 8601 format are:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+a space instead of the <code>T</code> date/time delimiter
+</p>
+</li>
+<li>
+<p>
+a space between time and time zone
+</p>
+</li>
+<li>
+<p>
+no colon between hours and minutes of the time zone
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p><code>--date=iso-strict</code> (or <code>--date=iso8601-strict</code>) shows timestamps in strict
+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 email messages.</p></div>
-<div class="paragraph"><p><tt>--date=short</tt> shows only the date, but not the 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 time zone
+<div class="paragraph"><p><code>--date=short</code> shows only the date, but not the 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 time zone
(either committer’s or author’s).</p></div>
</dd>
<dt class="hdlist1">
@@ -2053,30 +2071,30 @@ format, often found in email 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">
@@ -2090,8 +2108,8 @@ format, often found in email messages.</p></div> to be drawn properly.
</p>
<div class="paragraph"><p>This enables parent rewriting, see <em>History Simplification</em> below.</p></div>
-<div class="paragraph"><p>This implies the <tt>--topo-order</tt> option by default, but the
-<tt>--date-order</tt> option may also be specified.</p></div>
+<div class="paragraph"><p>This implies the <code>--topo-order</code> option by default, but the
+<code>--date-order</code> option may also be specified.</p></div>
</dd>
<dt class="hdlist1">
--show-linear-break[=<barrier>]
@@ -2101,7 +2119,7 @@ format, often found in email messages.</p></div> When --graph is not used, all history branches are flattened
which can make it hard to see that the two consecutive commits
do not belong to a linear branch. This option puts a barrier
- in between them in that case. If <tt><barrier></tt> is specified, it
+ in between them in that case. If <code><barrier></code> is specified, it
is the string that will be shown instead of the default one.
</p>
</dd>
@@ -2112,9 +2130,9 @@ format, often found in email messages.</p></div> <p>
Print a number stating how many commits would have been
listed, and suppress all other output. When used together
- with <tt>--left-right</tt>, instead print the counts for left and
+ with <code>--left-right</code>, instead print the counts for left and
right commits, separated by a tab. When used together with
- <tt>--cherry-mark</tt>, omit patch equivalent commits from these
+ <code>--cherry-mark</code>, omit patch equivalent commits from these
counts and print the count for equivalent commits separated
by a tab.
</p>
@@ -2148,7 +2166,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>
@@ -2158,12 +2176,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>
@@ -2172,17 +2190,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>
@@ -2191,17 +2209,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>
@@ -2210,19 +2228,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>
@@ -2231,14 +2249,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>
@@ -2264,8 +2282,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>
@@ -2343,7 +2361,12 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff </li>
<li>
<p>
-<em>%ai</em>: author date, ISO 8601 format
+<em>%ai</em>: author date, ISO 8601-like format
+</p>
+</li>
+<li>
+<p>
+<em>%aI</em>: author date, strict ISO 8601 format
</p>
</li>
<li>
@@ -2390,7 +2413,12 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff </li>
<li>
<p>
-<em>%ci</em>: committer date, ISO 8601 format
+<em>%ci</em>: committer date, ISO 8601-like format
+</p>
+</li>
+<li>
+<p>
+<em>%cI</em>: committer date, strict ISO 8601 format
</p>
</li>
<li>
@@ -2451,12 +2479,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>
@@ -2509,10 +2537,10 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff <li>
<p>
<em>%C(…)</em>: color specification, as described in color.branch.* config option;
- adding <tt>auto,</tt> at the beginning will emit color only when colors are
- enabled for log output (by <tt>color.diff</tt>, <tt>color.ui</tt>, or <tt>--color</tt>, and
- respecting the <tt>auto</tt> settings of the former if we are going to a
- terminal). <tt>auto</tt> alone (i.e. <tt>%C(auto)</tt>) will turn on auto coloring
+ adding <code>auto,</code> at the beginning will emit color only when colors are
+ enabled for log output (by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and
+ respecting the <code>auto</code> settings of the former if we are going to a
+ terminal). <code>auto</code> alone (i.e. <code>%C(auto)</code>) will turn on auto coloring
on the next placeholders until the color is switched again.
</p>
</li>
@@ -2585,16 +2613,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
@@ -2614,7 +2642,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
@@ -2622,15 +2650,15 @@ 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>
@@ -2646,7 +2674,7 @@ $ git log -2 --pretty=%h 4da45bef</tt></pre> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-02-27 15:06:29 PST
+Last updated 2014-09-19 15:32:09 PDT
</div>
</div>
</body>
|