Google Git
Sign in
chromium / external / gitster / git-htmldocs / 4cfa536eec2633958acf89eec55351257df9d11a / . / git-log.html
blob: 002f88d115a77c18c65c55c079a356f7f55900a9 [file] [log] [blame]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.2.5" />
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
/*
border: 1px solid red;
*/
}
body {
margin: 1em 5% 1em 5%;
}
a {
color: blue;
text-decoration: underline;
}
a:visited {
color: fuchsia;
}
em {
font-style: italic;
}
strong {
font-weight: bold;
}
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;
}
h1, h2, h3 {
border-bottom: 2px solid silver;
}
h2 {
padding-top: 0.5em;
}
h3 {
float: left;
}
h3 + * {
clear: left;
}
div.sectionbody {
font-family: serif;
margin-left: 0;
}
hr {
border: 1px solid silver;
}
p {
margin-top: 0.5em;
margin-bottom: 0.5em;
}
pre {
padding: 0;
margin: 0;
}
span#author {
color: #527bbd;
font-family: sans-serif;
font-weight: bold;
font-size: 1.1em;
}
span#email {
}
span#revision {
font-family: sans-serif;
}
div#footer {
font-family: sans-serif;
font-size: small;
border-top: 2px solid silver;
padding-top: 0.5em;
margin-top: 4.0em;
}
div#footer-text {
float: left;
padding-bottom: 0.5em;
}
div#footer-badges {
float: right;
padding-bottom: 0.5em;
}
div#preamble,
div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
margin-right: 10%;
margin-top: 1.5em;
margin-bottom: 1.5em;
}
div.admonitionblock {
margin-top: 2.5em;
margin-bottom: 2.5em;
}
div.content { /* Block element content. */
padding: 0;
}
/* Block element titles. */
div.title, caption.title {
font-family: sans-serif;
font-weight: bold;
text-align: left;
margin-top: 1.0em;
margin-bottom: 0.5em;
}
div.title + * {
margin-top: 0;
}
td div.title:first-child {
margin-top: 0.0em;
}
div.content div.title:first-child {
margin-top: 0.0em;
}
div.content + div.title {
margin-top: 0.0em;
}
div.sidebarblock > div.content {
background: #ffffee;
border: 1px solid silver;
padding: 0.5em;
}
div.listingblock {
margin-right: 0%;
}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
div.quoteblock > div.content {
padding-left: 2.0em;
}
div.attribution {
text-align: right;
}
div.verseblock + div.attribution {
text-align: left;
}
div.admonitionblock .icon {
vertical-align: top;
font-size: 1.1em;
font-weight: bold;
text-decoration: underline;
color: #527bbd;
padding-right: 0.5em;
}
div.admonitionblock td.content {
padding-left: 0.5em;
border-left: 2px solid silver;
}
div.exampleblock > div.content {
border-left: 2px solid silver;
padding: 0.5em;
}
div.verseblock div.content {
white-space: pre;
}
div.imageblock div.content { padding-left: 0; }
div.imageblock img { border: 1px solid silver; }
span.image img { border-style: none; }
dl {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
dt {
margin-top: 0.5em;
margin-bottom: 0;
font-style: italic;
}
dd > *:first-child {
margin-top: 0;
}
ul, ol {
list-style-position: outside;
}
div.olist2 ol {
list-style-type: lower-alpha;
}
div.tableblock > table {
border: 3px solid #527bbd;
}
thead {
font-family: sans-serif;
font-weight: bold;
}
tfoot {
font-weight: bold;
}
div.hlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
div.hlist td {
padding-bottom: 5px;
}
td.hlist1 {
vertical-align: top;
font-style: italic;
padding-right: 0.8em;
}
td.hlist2 {
vertical-align: top;
}
@media print {
div#footer-badges { display: none; }
}
div#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 {
margin-top: 0;
margin-bottom: 0;
}
div.toclevel2 {
margin-left: 2em;
font-size: 0.9em;
}
div.toclevel3 {
margin-left: 4em;
font-size: 0.9em;
}
div.toclevel4 {
margin-left: 6em;
font-size: 0.9em;
}
include1::./stylesheets/xhtml11-manpage.css[]
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
background: #ffffee;
border: 1px solid silver;
padding: 0.5em;
}
div.sidebar-title, div.image-title {
font-family: sans-serif;
font-weight: bold;
margin-top: 0.0em;
margin-bottom: 0.5em;
}
div.listingblock div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
div.quoteblock-content {
padding-left: 2.0em;
}
div.exampleblock-content {
border-left: 2px solid silver;
padding-left: 0.5em;
}
/* IE6 sets dynamically generated links as visited. */
div#toc a:visited { color: blue; }
</style>
<title>git-log(1)</title>
</head>
<body>
<div id="header">
<h1>
git-log(1) Manual Page
</h1>
<h2>NAME</h2>
<div class="sectionbody">
<p>git-log -
Show commit logs
</p>
</div>
</div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
<div class="para"><p><em>git log</em> [&lt;options&gt;] [&lt;since&gt;..&lt;until&gt;] [[--] &lt;path&gt;&#8230;]</p></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="para"><p>Shows the commit logs.</p></div>
<div class="para"><p>The command takes options applicable to the <em>git-rev-list</em>
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>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
<div class="vlist"><dl>
<dt>
-p
</dt>
<dt>
-u
</dt>
<dd>
<p>
Generate patch (see section on generating patches).
</p>
</dd>
<dt>
-U&lt;n&gt;
</dt>
<dt>
--unified=&lt;n&gt;
</dt>
<dd>
<p>
Generate diffs with &lt;n&gt; lines of context instead of
the usual three. Implies "-p".
</p>
</dd>
<dt>
--raw
</dt>
<dd>
<p>
Generate the raw format.
</p>
</dd>
<dt>
--patch-with-raw
</dt>
<dd>
<p>
Synonym for "-p --raw".
</p>
</dd>
<dt>
--patience
</dt>
<dd>
<p>
Generate a diff using the "patience diff" algorithm.
</p>
</dd>
<dt>
--stat[=width[,name-width]]
</dt>
<dd>
<p>
Generate a diffstat. You can override the default
output width for 80-column terminal by "--stat=width".
The width of the filename part can be controlled by
giving another width to it separated by a comma.
</p>
</dd>
<dt>
--numstat
</dt>
<dd>
<p>
Similar to --stat, 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>.
</p>
</dd>
<dt>
--shortstat
</dt>
<dd>
<p>
Output only the last line of the --stat format containing total
number of modified files, as well as number of added and deleted
lines.
</p>
</dd>
<dt>
--dirstat[=limit]
</dt>
<dd>
<p>
Output the distribution of relative amount of changes (number of lines added or
removed) for each sub-directory. Directories with changes below
a cut-off percent (3% by default) are not shown. The cut-off percent
can be set with "--dirstat=limit". Changes in a child directory is not
counted for the parent directory, unless "--cumulative" is used.
</p>
</dd>
<dt>
--dirstat-by-file[=limit]
</dt>
<dd>
<p>
Same as --dirstat, but counts changed files instead of lines.
</p>
</dd>
<dt>
--summary
</dt>
<dd>
<p>
Output a condensed summary of extended header information
such as creations, renames and mode changes.
</p>
</dd>
<dt>
--patch-with-stat
</dt>
<dd>
<p>
Synonym for "-p --stat".
</p>
</dd>
<dt>
-z
</dt>
<dd>
<p>
NUL-line termination on output. This affects the --raw
output field terminator. Also output from commands such
as "git-log" will be delimited with NUL between commits.
</p>
</dd>
<dt>
--name-only
</dt>
<dd>
<p>
Show only names of changed files.
</p>
</dd>
<dt>
--name-status
</dt>
<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.
</p>
</dd>
<dt>
--color
</dt>
<dd>
<p>
Show colored diff.
</p>
</dd>
<dt>
--no-color
</dt>
<dd>
<p>
Turn off colored diff, even when the configuration file
gives the default to color output.
</p>
</dd>
<dt>
--color-words[=&lt;regex&gt;]
</dt>
<dd>
<p>
Show colored word diff, i.e., color words which have changed.
By default, words are separated by whitespace.
</p>
<div class="para"><p>When a &lt;regex&gt; is specified, every non-overlapping match of the
&lt;regex&gt; 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
expression to make sure that it matches all non-whitespace characters.
A match that contains a newline is silently truncated(!) at the
newline.</p></div>
<div class="para"><p>The regex can also be set via a diff driver or configuration option, see
<a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
overrides any diff driver or configuration setting. Diff drivers
override configuration settings.</p></div>
</dd>
<dt>
--no-renames
</dt>
<dd>
<p>
Turn off rename detection, even when the configuration
file gives the default to do so.
</p>
</dd>
<dt>
--check
</dt>
<dd>
<p>
Warn if changes introduce trailing whitespace
or an indent that uses a space before a tab. Exits with
non-zero status if problems are found. Not compatible with
--exit-code.
</p>
</dd>
<dt>
--full-index
</dt>
<dd>
<p>
Instead of the first handful of characters, show the full
pre- and post-image blob object names on the "index"
line when generating patch format output.
</p>
</dd>
<dt>
--binary
</dt>
<dd>
<p>
In addition to --full-index, output "binary diff" that
can be applied with "git apply".
</p>
</dd>
<dt>
--abbrev[=&lt;n&gt;]
</dt>
<dd>
<p>
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 --full-index option above, which controls
the diff-patch output format. Non default number of
digits can be specified with --abbrev=&lt;n&gt;.
</p>
</dd>
<dt>
-B
</dt>
<dd>
<p>
Break complete rewrite changes into pairs of delete and create.
</p>
</dd>
<dt>
-M
</dt>
<dd>
<p>
Detect renames.
</p>
</dd>
<dt>
-C
</dt>
<dd>
<p>
Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
</p>
</dd>
<dt>
--diff-filter=[ACDMRTUXB*]
</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, &#8230;) changed (<tt>T</tt>),
are Unmerged (<tt>U</tt>), are
Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
Any combination of the filter characters may be used.
When <tt>*</tt> (All-or-none) is added to the combination, all
paths are selected if there is any file that matches
other criteria in the comparison; if there is no file
that matches other criteria, nothing is selected.
</p>
</dd>
<dt>
--find-copies-harder
</dt>
<dd>
<p>
For performance reasons, by default, <tt>-C</tt> 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.
</p>
</dd>
<dt>
-l&lt;num&gt;
</dt>
<dd>
<p>
-M and -C 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
number.
</p>
</dd>
<dt>
-S&lt;string&gt;
</dt>
<dd>
<p>
Look for differences that introduce or remove an instance of
&lt;string&gt;. Note that this is different than the string simply
appearing in diff output; see the <em>pickaxe</em> entry in
<a href="gitdiffcore.html">gitdiffcore(7)</a> for more details.
</p>
</dd>
<dt>
--pickaxe-all
</dt>
<dd>
<p>
When -S finds a change, show all the changes in that
changeset, not just the files that contain the change
in &lt;string&gt;.
</p>
</dd>
<dt>
--pickaxe-regex
</dt>
<dd>
<p>
Make the &lt;string&gt; not a plain string but an extended POSIX
regex to match.
</p>
</dd>
<dt>
-O&lt;orderfile&gt;
</dt>
<dd>
<p>
Output the patch in the order specified in the
&lt;orderfile&gt;, which has one shell glob pattern per line.
</p>
</dd>
<dt>
-R
</dt>
<dd>
<p>
Swap two inputs; that is, show differences from index or
on-disk file to tree contents.
</p>
</dd>
<dt>
--relative[=&lt;path&gt;]
</dt>
<dd>
<p>
When run from a subdirectory of the project, it can be
told to exclude changes outside the directory and show
pathnames relative to it with this option. When you are
not in a subdirectory (e.g. in a bare repository), you
can name which subdirectory to make the output relative
to by giving a &lt;path&gt; as an argument.
</p>
</dd>
<dt>
-a
</dt>
<dt>
--text
</dt>
<dd>
<p>
Treat all files as text.
</p>
</dd>
<dt>
--ignore-space-at-eol
</dt>
<dd>
<p>
Ignore changes in whitespace at EOL.
</p>
</dd>
<dt>
-b
</dt>
<dt>
--ignore-space-change
</dt>
<dd>
<p>
Ignore changes in amount of whitespace. This ignores whitespace
at line end, and considers all other sequences of one or
more whitespace characters to be equivalent.
</p>
</dd>
<dt>
-w
</dt>
<dt>
--ignore-all-space
</dt>
<dd>
<p>
Ignore whitespace when comparing lines. This ignores
differences even if one line has whitespace where the other
line has none.
</p>
</dd>
<dt>
--inter-hunk-context=&lt;lines&gt;
</dt>
<dd>
<p>
Show the context between diff hunks, up to the specified number
of lines, thereby fusing hunks that are close to each other.
</p>
</dd>
<dt>
--exit-code
</dt>
<dd>
<p>
Make the program exit with codes similar to diff(1).
That is, it exits with 1 if there were differences and
0 means no differences.
</p>
</dd>
<dt>
--quiet
</dt>
<dd>
<p>
Disable all output of the program. Implies --exit-code.
</p>
</dd>
<dt>
--ext-diff
</dt>
<dd>
<p>
Allow an external diff helper to be executed. If you set an
external diff driver with <a href="gitattributes.html">gitattributes(5)</a>, you need
to use this option with <a href="git-log.html">git-log(1)</a> and friends.
</p>
</dd>
<dt>
--no-ext-diff
</dt>
<dd>
<p>
Disallow external diff drivers.
</p>
</dd>
<dt>
--ignore-submodules
</dt>
<dd>
<p>
Ignore changes to submodules in the diff generation.
</p>
</dd>
<dt>
--src-prefix=&lt;prefix&gt;
</dt>
<dd>
<p>
Show the given source prefix instead of "a/".
</p>
</dd>
<dt>
--dst-prefix=&lt;prefix&gt;
</dt>
<dd>
<p>
Show the given destination prefix instead of "b/".
</p>
</dd>
<dt>
--no-prefix
</dt>
<dd>
<p>
Do not show any source or destination prefix.
</p>
</dd>
</dl></div>
<div class="para"><p>For more detailed explanation on these common options, see also
<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>
<div class="vlist"><dl>
<dt>
-&lt;n&gt;
</dt>
<dd>
<p>
Limits the number of commits to show.
</p>
</dd>
<dt>
&lt;since&gt;..&lt;until&gt;
</dt>
<dd>
<p>
Show only commits between the named two commits. When
either &lt;since&gt; or &lt;until&gt; is omitted, it defaults to
<tt>HEAD</tt>, i.e. the tip of the current branch.
For a more complete list of ways to spell &lt;since&gt;
and &lt;until&gt;, see "SPECIFYING REVISIONS" section in
<a href="git-rev-parse.html">git-rev-parse(1)</a>.
</p>
</dd>
<dt>
--decorate
</dt>
<dd>
<p>
Print out the ref names of any commits that are shown.
</p>
</dd>
<dt>
--source
</dt>
<dd>
<p>
Print out the ref name given on the command line by which each
commit was reached.
</p>
</dd>
<dt>
--full-diff
</dt>
<dd>
<p>
Without this flag, "git log -p &lt;path&gt;&#8230;" shows commits that
touch the specified paths, and diffs about the same specified
paths. With this, the full diff is shown for commits that touch
the specified paths; this means that "&lt;path&gt;&#8230;" limits only
commits, and doesn't limit diff for those commits.
</p>
</dd>
<dt>
--follow
</dt>
<dd>
<p>
Continue listing the history of a file beyond renames.
</p>
</dd>
<dt>
--log-size
</dt>
<dd>
<p>
Before the log message print out its size in bytes. Intended
mainly for porcelain tools consumption. If git is unable to
produce a valid value size is set to zero.
Note that only message is considered, if also a diff is shown
its size is not included.
</p>
</dd>
<dt>
[--] &lt;path&gt;&#8230;
</dt>
<dd>
<p>
Show only commits that affect any of the specified paths. To
prevent confusion with options and branch names, paths may need
to be prefixed with "-- " to separate them from options or
refnames.
</p>
</dd>
</dl></div>
<h3 id="_commit_formatting">Commit Formatting</h3><div style="clear:left"></div>
<div class="vlist"><dl>
<dt>
--pretty[=<em>&lt;format&gt;</em>]
</dt>
<dt>
--format[=<em>&lt;format&gt;</em>]
</dt>
<dd>
<p>
Pretty-print the contents of the commit logs in a given format,
where <em>&lt;format&gt;</em> can be one of <em>oneline</em>, <em>short</em>, <em>medium</em>,
<em>full</em>, <em>fuller</em>, <em>email</em>, <em>raw</em> and <em>format:&lt;string&gt;</em>.
When omitted, the format defaults to <em>medium</em>.
</p>
<div class="para"><p>Note: you can specify the default pretty format in the repository
configuration (see <a href="git-config.html">git-config(1)</a>).</p></div>
</dd>
<dt>
--abbrev-commit
</dt>
<dd>
<p>
Instead of showing the full 40-byte hexadecimal commit object
name, show only a partial prefix. Non default number of
digits can be specified with "--abbrev=&lt;n&gt;" (which also modifies
diff output, if it is displayed).
</p>
<div class="para"><p>This should make "--pretty=oneline" a whole lot more readable for
people using 80-column terminals.</p></div>
</dd>
<dt>
--oneline
</dt>
<dd>
<p>
This is a shorthand for "--pretty=oneline --abbrev-commit"
used together.
</p>
</dd>
<dt>
--encoding[=&lt;encoding&gt;]
</dt>
<dd>
<p>
The commit objects record the encoding used for the log message
in their encoding header; this option can be used to tell the
command to re-code the commit log message in the encoding
preferred by the user. For non plumbing commands this
defaults to UTF-8.
</p>
</dd>
<dt>
--relative-date
</dt>
<dd>
<p>
Synonym for <tt>--date=relative</tt>.
</p>
</dd>
<dt>
--date={relative,local,default,iso,rfc,short,raw}
</dt>
<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
value for log command's --date option.
</p>
<div class="para"><p><tt>--date=relative</tt> shows dates relative to the current time,
e.g. "2 hours ago".</p></div>
<div class="para"><p><tt>--date=local</tt> shows timestamps in user's local timezone.</p></div>
<div class="para"><p><tt>--date=iso</tt> (or <tt>--date=iso8601</tt>) shows timestamps in ISO 8601 format.</p></div>
<div class="para"><p><tt>--date=rfc</tt> (or <tt>--date=rfc2822</tt>) shows timestamps in RFC 2822
format, often found in E-mail messages.</p></div>
<div class="para"><p><tt>--date=short</tt> shows only date but not time, in <tt>YYYY-MM-DD</tt> format.</p></div>
<div class="para"><p><tt>--date=raw</tt> shows the date in the internal raw git format <tt>%s %z</tt> format.</p></div>
<div class="para"><p><tt>--date=default</tt> shows timestamps in the original timezone
(either committer's or author's).</p></div>
</dd>
<dt>
--parents
</dt>
<dd>
<p>
Print the parents of the commit. Also enables parent
rewriting, see <em>History Simplification</em> below.
</p>
</dd>
<dt>
--children
</dt>
<dd>
<p>
Print the children of the commit. Also enables parent
rewriting, see <em>History Simplification</em> below.
</p>
</dd>
<dt>
--left-right
</dt>
<dd>
<p>
Mark which side of a symmetric diff a commit is reachable from.
Commits from the left side are prefixed with <tt>&lt;</tt> and those from
the right with <tt>&gt;</tt>. If combined with <tt>--boundary</tt>, those
commits are prefixed with <tt>-</tt>.
</p>
<div class="para"><p>For example, if you have this topology:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> y---b---b branch B
/ \ /
/ .
/ / \
o---x---a---a branch A</tt></pre>
</div></div>
<div class="para"><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
&gt;bbbbbbb... 3rd on b
&gt;bbbbbbb... 2nd on b
&lt;aaaaaaa... 3rd on a
&lt;aaaaaaa... 2nd on a
-yyyyyyy... 1st on b
-xxxxxxx... 1st on a</tt></pre>
</div></div>
</dd>
<dt>
--graph
</dt>
<dd>
<p>
Draw a text-based graphical representation of the commit history
on the left hand side of the output. This may cause extra lines
to be printed in between commits, in order for the graph history
to be drawn properly.
</p>
<div class="para"><p>This implies the <em>--topo-order</em> option by default, but the
<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 class="para"><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>
<div class="vlist"><dl>
<dt>
-c
</dt>
<dd>
<p>
This flag changes the way a merge commit is displayed. It shows
the differences from each of the parents to the merge result
simultaneously instead of showing pairwise diff between a parent
and the result one at a time. Furthermore, it lists only files
which were modified from all parents.
</p>
</dd>
<dt>
--cc
</dt>
<dd>
<p>
This flag implies the <em>-c</em> options and further compresses the
patch output by omitting uninteresting hunks whose contents in
the parents have only two variants and the merge result picks
one of them without modification.
</p>
</dd>
<dt>
-r
</dt>
<dd>
<p>
Show recursive diffs.
</p>
</dd>
<dt>
-t
</dt>
<dd>
<p>
Show the tree objects in the diff output. This implies <em>-r</em>.
</p>
</dd>
</dl></div>
<h3 id="_commit_limiting">Commit Limiting</h3><div style="clear:left"></div>
<div class="para"><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="vlist"><dl>
<dt>
-n <em>number</em>
</dt>
<dt>
--max-count=&lt;number&gt;
</dt>
<dd>
<p>
Limit the number of commits output.
</p>
</dd>
<dt>
--skip=&lt;number&gt;
</dt>
<dd>
<p>
Skip <em>number</em> commits before starting to show the commit output.
</p>
</dd>
<dt>
--since=&lt;date&gt;
</dt>
<dt>
--after=&lt;date&gt;
</dt>
<dd>
<p>
Show commits more recent than a specific date.
</p>
</dd>
<dt>
--until=&lt;date&gt;
</dt>
<dt>
--before=&lt;date&gt;
</dt>
<dd>
<p>
Show commits older than a specific date.
</p>
</dd>
<dt>
--author=&lt;pattern&gt;
</dt>
<dt>
--committer=&lt;pattern&gt;
</dt>
<dd>
<p>
Limit the commits output to ones with author/committer
header lines that match the specified pattern (regular expression).
</p>
</dd>
<dt>
--grep=&lt;pattern&gt;
</dt>
<dd>
<p>
Limit the commits output to ones with log message that
matches the specified pattern (regular expression).
</p>
</dd>
<dt>
--all-match
</dt>
<dd>
<p>
Limit the commits output to ones that match all given --grep,
--author and --committer instead of ones that match at least one.
</p>
</dd>
<dt>
-i
</dt>
<dt>
--regexp-ignore-case
</dt>
<dd>
<p>
Match the regexp limiting patterns without regard to letters case.
</p>
</dd>
<dt>
-E
</dt>
<dt>
--extended-regexp
</dt>
<dd>
<p>
Consider the limiting patterns to be extended regular expressions
instead of the default basic regular expressions.
</p>
</dd>
<dt>
-F
</dt>
<dt>
--fixed-strings
</dt>
<dd>
<p>
Consider the limiting patterns to be fixed strings (don't interpret
pattern as a regular expression).
</p>
</dd>
<dt>
--remove-empty
</dt>
<dd>
<p>
Stop when a given path disappears from the tree.
</p>
</dd>
<dt>
--no-merges
</dt>
<dd>
<p>
Do not print commits with more than one parent.
</p>
</dd>
<dt>
--first-parent
</dt>
<dd>
<p>
Follow only the first parent commit upon seeing a merge
commit. This option can give a better overview when
viewing the evolution of a particular topic branch,
because merges into a topic branch tend to be only about
adjusting to updated upstream from time to time, and
this option allows you to ignore the individual commits
brought in to your history by such a merge.
</p>
</dd>
<dt>
--not
</dt>
<dd>
<p>
Reverses the meaning of the <em>&#94;</em> prefix (or lack thereof)
for all following revision specifiers, up to the next <em>--not</em>.
</p>
</dd>
<dt>
--all
</dt>
<dd>
<p>
Pretend as if all the refs in <tt>$GIT_DIR/refs/</tt> are listed on the
command line as <em>&lt;commit&gt;</em>.
</p>
</dd>
<dt>
--branches
</dt>
<dd>
<p>
Pretend as if all the refs in <tt>$GIT_DIR/refs/heads</tt> are listed
on the command line as <em>&lt;commit&gt;</em>.
</p>
</dd>
<dt>
--tags
</dt>
<dd>
<p>
Pretend as if all the refs in <tt>$GIT_DIR/refs/tags</tt> are listed
on the command line as <em>&lt;commit&gt;</em>.
</p>
</dd>
<dt>
--remotes
</dt>
<dd>
<p>
Pretend as if all the refs in <tt>$GIT_DIR/refs/remotes</tt> are listed
on the command line as <em>&lt;commit&gt;</em>.
</p>
</dd>
<dt>
--cherry-pick
</dt>
<dd>
<p>
Omit any commit that introduces the same change as
another commit on the "other side" when the set of
commits are limited with symmetric difference.<br />
For example, if you have two branches, <tt>A</tt> and <tt>B</tt>, a usual way
to list all commits on only one side of them is with
<tt>--left-right</tt>, like the example above in the description of
that 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>
</dd>
<dt>
-g
</dt>
<dt>
--walk-reflogs
</dt>
<dd>
<p>
Instead of walking the commit ancestry chain, walk
reflog entries from the most recent one to older ones.
When this option is used you cannot specify commits to
exclude (that is, <em>&#94;commit</em>, <em>commit1..commit2</em>,
nor <em>commit1&#8230;commit2</em> notations cannot be used).<br />
With <em>--pretty</em> format other than oneline (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 <em>--pretty=oneline</em>, the commit message is
prefixed with this information on the same line.
This option cannot be combined with <em>--reverse</em>.
See also <a href="git-reflog.html">git-reflog(1)</a>.
</p>
</dd>
<dt>
--merge
</dt>
<dd>
<p>
After a failed merge, show refs that touch files having a
conflict and don't exist on all heads to merge.
</p>
</dd>
<dt>
--boundary
</dt>
<dd>
<p>
Output uninteresting commits at the boundary, which are usually
not shown.
</p>
</dd>
</dl></div>
<h3 id="_history_simplification">History Simplification</h3><div style="clear:left"></div>
<div class="para"><p>Sometimes you are only interested in parts of the history, for example the
commits modifying a particular &lt;path&gt;. But there are two parts of
<em>History Simplification</em>, one part is selecting the commits and the other
is how to do it, as there are various strategies to simplify the history.</p></div>
<div class="para"><p>The following options select the commits to be shown:</p></div>
<div class="vlist"><dl>
<dt>
&lt;paths&gt;
</dt>
<dd>
<p>
Commits modifying the given &lt;paths&gt; are selected.
</p>
</dd>
<dt>
--simplify-by-decoration
</dt>
<dd>
<p>
Commits that are referred by some branch or tag are selected.
</p>
</dd>
</dl></div>
<div class="para"><p>Note that extra commits can be shown to give a meaningful history.</p></div>
<div class="para"><p>The following options affect the way the simplification is performed:</p></div>
<div class="vlist"><dl>
<dt>
Default mode
</dt>
<dd>
<p>
Simplifies the history to the simplest history explaining the
final state of the tree. Simplest because it prunes some side
branches if the end result is the same (i.e. merging branches
with the same content)
</p>
</dd>
<dt>
--full-history
</dt>
<dd>
<p>
As the default mode but does not prune some history.
</p>
</dd>
<dt>
--dense
</dt>
<dd>
<p>
Only the selected commits are shown, plus some to have a
meaningful history.
</p>
</dd>
<dt>
--sparse
</dt>
<dd>
<p>
All commits in the simplified history are shown.
</p>
</dd>
<dt>
--simplify-merges
</dt>
<dd>
<p>
Additional option to <em>--full-history</em> to remove some needless
merges from the resulting history, as there are no selected
commits contributing to this merge.
</p>
</dd>
</dl></div>
<div class="para"><p>A more detailed explanation follows.</p></div>
<div class="para"><p>Suppose you specified <tt>foo</tt> as the &lt;paths&gt;. 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="para"><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>
<div class="listingblock">
<div class="content">
<pre><tt> .-A---M---N---O---P
/ / / / /
I B C D E
\ / / / /
`-------------'</tt></pre>
</div></div>
<div class="para"><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="ilist"><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.
</p>
</li>
<li>
<p>
In <tt>A</tt>, <tt>foo</tt> 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
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",
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.
</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
TREESAME to all parents.
</p>
</li>
</ul></div>
<div class="para"><p><em>rev-list</em> walks backwards through history, including or excluding
commits based on whether <em>--full-history</em> and/or parent rewriting
(via <em>--parents</em> or <em>--children</em>) are used. The following settings
are available.</p></div>
<div class="vlist"><dl>
<dt>
Default mode
</dt>
<dd>
<p>
Commits are included if they are not TREESAME to any parent
(though this can be changed, see <em>--sparse</em> 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
parents.
</p>
<div class="para"><p>This results in:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> .-A---N---O
/ /
I---------D</tt></pre>
</div></div>
<div class="para"><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="para"><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>
</dd>
<dt>
--full-history without parent rewriting
</dt>
<dd>
<p>
This mode differs from the default in one point: always follow
all parents of a merge, even if it is TREESAME to one of them.
Even if more than one side of the merge has commits that are
included, this does not imply that the merge itself is! In
the example, we get
</p>
<div class="listingblock">
<div class="content">
<pre><tt> I A B N D O</tt></pre>
</div></div>
<div class="para"><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
do not appear.</p></div>
<div class="para"><p>Note that without parent rewriting, it is not really possible to talk
about the parent/child relationships between the commits, so we show
them disconnected.</p></div>
</dd>
<dt>
--full-history with parent rewriting
</dt>
<dd>
<p>
Ordinary commits are only included if they are !TREESAME
(though this can be changed, see <em>--sparse</em> below).
</p>
<div class="para"><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
/ / / / /
I B / D /
\ / / / /
`-------------'</tt></pre>
</div></div>
<div class="para"><p>Compare to <em>--full-history</em> without rewriting above. Note that <tt>E</tt>
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>
</dd>
</dl></div>
<div class="para"><p>In addition to the above settings, you can change whether TREESAME
affects inclusion:</p></div>
<div class="vlist"><dl>
<dt>
--dense
</dt>
<dd>
<p>
Commits that are walked are included if they are not TREESAME
to any parent.
</p>
</dd>
<dt>
--sparse
</dt>
<dd>
<p>
All commits that are walked are included.
</p>
<div class="para"><p>Note that without <em>--full-history</em>, 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>
</dl></div>
<div class="para"><p>Finally, there is a fourth simplification mode available:</p></div>
<div class="vlist"><dl>
<dt>
--simplify-merges
</dt>
<dd>
<p>
First, build a history graph in the same way that
<em>--full-history</em> with parent rewriting does (see above).
</p>
<div class="para"><p>Then simplify each commit <tt>C</tt> to its replacement <tt>C'</tt> in the final
history according to the following rules:</p></div>
<div class="ilist"><ul>
<li>
<p>
Set <tt>C'</tt> to <tt>C</tt>.<br />
</p>
</li>
<li>
<p>
Replace each parent <tt>P</tt> of <tt>C'</tt> with its simplification <tt>P'</tt>. In
the process, drop parents that are ancestors of other parents, and
remove duplicates.<br />
</p>
</li>
<li>
<p>
If after this parent rewriting, <tt>C'</tt> is a root or merge commit (has
zero or &gt;1 parents), a boundary commit, or !TREESAME, it remains.
Otherwise, it is replaced with its only parent.
</p>
</li>
</ul></div>
<div class="para"><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
/ / /
I B D
\ / /
`---------'</tt></pre>
</div></div>
<div class="para"><p>Note the major differences in <tt>N</tt> and <tt>P</tt> over <em>--full-history</em>:</p></div>
<div class="ilist"><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.<br />
</p>
</li>
<li>
<p>
<tt>P</tt>'s parent list similarly had <tt>I</tt> removed. <tt>P</tt> was then
removed completely, because it had one parent and is TREESAME.
</p>
</li>
</ul></div>
</dd>
</dl></div>
<div class="para"><p>The <em>--simplify-by-decoration</em> 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
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 class="para"><p>By default, the commits are shown in reverse chronological order.</p></div>
<div class="vlist"><dl>
<dt>
--topo-order
</dt>
<dd>
<p>
This option makes them appear in topological order (i.e.
descendant commits are shown before their parents).
</p>
</dd>
<dt>
--date-order
</dt>
<dd>
<p>
This option is similar to <em>--topo-order</em> in the sense that no
parent comes before all of its children, but otherwise things
are still ordered in the commit timestamp order.
</p>
</dd>
<dt>
--reverse
</dt>
<dd>
<p>
Output the commits in reverse order.
Cannot be combined with <em>--walk-reflogs</em>.
</p>
</dd>
</dl></div>
<h3 id="_object_traversal">Object Traversal</h3><div style="clear:left"></div>
<div class="para"><p>These options are mostly targeted for packing of git repositories.</p></div>
<div class="vlist"><dl>
<dt>
--objects
</dt>
<dd>
<p>
Print the object IDs of any object referenced by the listed
commits. <em>--objects foo ^bar</em> 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>
</dd>
<dt>
--objects-edge
</dt>
<dd>
<p>
Similar to <em>--objects</em>, 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
excluded commits to reduce network traffic.
</p>
</dd>
<dt>
--unpacked
</dt>
<dd>
<p>
Only useful with <em>--objects</em>; print the object IDs that are not
in packs.
</p>
</dd>
<dt>
--no-walk
</dt>
<dd>
<p>
Only show the given revs, but do not traverse their ancestors.
</p>
</dd>
<dt>
--do-walk
</dt>
<dd>
<p>
Overrides a previous --no-walk.
</p>
</dd>
</dl></div>
</div>
<h2 id="_pretty_formats">PRETTY FORMATS</h2>
<div class="sectionbody">
<div class="para"><p>If the commit is a merge, and if the pretty-format
is not <em>oneline</em>, <em>email</em> or <em>raw</em>, an additional line is
inserted before the <em>Author:</em> line. This line begins with
"Merge: " and the sha1s of ancestral commits are printed,
separated by spaces. Note that the listed commits may not
necessarily be the list of the <strong>direct</strong> parent commits if you
have limited your view of history: for example, if you are
only interested in changes related to a certain directory or
file.</p></div>
<div class="para"><p>Here are some additional details for each format:</p></div>
<div class="ilist"><ul>
<li>
<p>
<em>oneline</em>
</p>
<div class="literalblock">
<div class="content">
<pre><tt>&lt;sha1&gt; &lt;title line&gt;</tt></pre>
</div></div>
<div class="para"><p>This is designed to be as compact as possible.</p></div>
</li>
<li>
<p>
<em>short</em>
</p>
<div class="literalblock">
<div class="content">
<pre><tt>commit &lt;sha1&gt;
Author: &lt;author&gt;</tt></pre>
</div></div>
<div class="literalblock">
<div class="content">
<pre><tt>&lt;title line&gt;</tt></pre>
</div></div>
</li>
<li>
<p>
<em>medium</em>
</p>
<div class="literalblock">
<div class="content">
<pre><tt>commit &lt;sha1&gt;
Author: &lt;author&gt;
Date: &lt;author date&gt;</tt></pre>
</div></div>
<div class="literalblock">
<div class="content">
<pre><tt>&lt;title line&gt;</tt></pre>
</div></div>
<div class="literalblock">
<div class="content">
<pre><tt>&lt;full commit message&gt;</tt></pre>
</div></div>
</li>
<li>
<p>
<em>full</em>
</p>
<div class="literalblock">
<div class="content">
<pre><tt>commit &lt;sha1&gt;
Author: &lt;author&gt;
Commit: &lt;committer&gt;</tt></pre>
</div></div>
<div class="literalblock">
<div class="content">
<pre><tt>&lt;title line&gt;</tt></pre>
</div></div>
<div class="literalblock">
<div class="content">
<pre><tt>&lt;full commit message&gt;</tt></pre>
</div></div>
</li>
<li>
<p>
<em>fuller</em>
</p>
<div class="literalblock">
<div class="content">
<pre><tt>commit &lt;sha1&gt;
Author: &lt;author&gt;
AuthorDate: &lt;author date&gt;
Commit: &lt;committer&gt;
CommitDate: &lt;committer date&gt;</tt></pre>
</div></div>
<div class="literalblock">
<div class="content">
<pre><tt>&lt;title line&gt;</tt></pre>
</div></div>
<div class="literalblock">
<div class="content">
<pre><tt>&lt;full commit message&gt;</tt></pre>
</div></div>
</li>
<li>
<p>
<em>email</em>
</p>
<div class="literalblock">
<div class="content">
<pre><tt>From &lt;sha1&gt; &lt;date&gt;
From: &lt;author&gt;
Date: &lt;author date&gt;
Subject: [PATCH] &lt;title line&gt;</tt></pre>
</div></div>
<div class="literalblock">
<div class="content">
<pre><tt>&lt;full commit message&gt;</tt></pre>
</div></div>
</li>
<li>
<p>
<em>raw</em>
</p>
<div class="para"><p>The <em>raw</em> format shows the entire commit exactly as
stored in the commit object. Notably, the SHA1s are
displayed in full, regardless of whether --abbrev or
--no-abbrev are used, and <em>parents</em> information show the
true parent commits, without taking grafts nor history
simplification into account.</p></div>
</li>
<li>
<p>
<em>format:</em>
</p>
<div class="para"><p>The <em>format:</em> format allows you to specify which information
you want to show. It works a little bit like printf format,
with the notable exception that you get a newline with <em>%n</em>
instead of <em>\n</em>.</p></div>
<div class="para"><p>E.g, <em>format:"The author of %h was %an, %ar%nThe title was &gt;&gt;%s&lt;&lt;%n"</em>
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 &gt;&gt;t4119: test autocomputing -p&lt;n&gt; for traditional diff input.&lt;&lt;
</tt></pre>
</div></div>
<div class="para"><p>The placeholders are:</p></div>
<div class="ilist"><ul>
<li>
<p>
<em>%H</em>: commit hash
</p>
</li>
<li>
<p>
<em>%h</em>: abbreviated commit hash
</p>
</li>
<li>
<p>
<em>%T</em>: tree hash
</p>
</li>
<li>
<p>
<em>%t</em>: abbreviated tree hash
</p>
</li>
<li>
<p>
<em>%P</em>: parent hashes
</p>
</li>
<li>
<p>
<em>%p</em>: abbreviated parent hashes
</p>
</li>
<li>
<p>
<em>%an</em>: author name
</p>
</li>
<li>
<p>
<em>%aN</em>: author name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
</p>
</li>
<li>
<p>
<em>%ae</em>: author email
</p>
</li>
<li>
<p>
<em>%aE</em>: author email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
</p>
</li>
<li>
<p>
<em>%ad</em>: author date (format respects --date= option)
</p>
</li>
<li>
<p>
<em>%aD</em>: author date, RFC2822 style
</p>
</li>
<li>
<p>
<em>%ar</em>: author date, relative
</p>
</li>
<li>
<p>
<em>%at</em>: author date, UNIX timestamp
</p>
</li>
<li>
<p>
<em>%ai</em>: author date, ISO 8601 format
</p>
</li>
<li>
<p>
<em>%cn</em>: committer name
</p>
</li>
<li>
<p>
<em>%cN</em>: committer name (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
</p>
</li>
<li>
<p>
<em>%ce</em>: committer email
</p>
</li>
<li>
<p>
<em>%cE</em>: committer email (respecting .mailmap, see <a href="git-shortlog.html">git-shortlog(1)</a> or <a href="git-blame.html">git-blame(1)</a>)
</p>
</li>
<li>
<p>
<em>%cd</em>: committer date
</p>
</li>
<li>
<p>
<em>%cD</em>: committer date, RFC2822 style
</p>
</li>
<li>
<p>
<em>%cr</em>: committer date, relative
</p>
</li>
<li>
<p>
<em>%ct</em>: committer date, UNIX timestamp
</p>
</li>
<li>
<p>
<em>%ci</em>: committer date, ISO 8601 format
</p>
</li>
<li>
<p>
<em>%d</em>: ref names, like the --decorate option of <a href="git-log.html">git-log(1)</a>
</p>
</li>
<li>
<p>
<em>%e</em>: encoding
</p>
</li>
<li>
<p>
<em>%s</em>: subject
</p>
</li>
<li>
<p>
<em>%f</em>: sanitized subject line, suitable for a filename
</p>
</li>
<li>
<p>
<em>%b</em>: body
</p>
</li>
<li>
<p>
<em>%Cred</em>: switch color to red
</p>
</li>
<li>
<p>
<em>%Cgreen</em>: switch color to green
</p>
</li>
<li>
<p>
<em>%Cblue</em>: switch color to blue
</p>
</li>
<li>
<p>
<em>%Creset</em>: reset color
</p>
</li>
<li>
<p>
<em>%C(&#8230;)</em>: color specification, as described in color.branch.* config option
</p>
</li>
<li>
<p>
<em>%m</em>: left, right or boundary mark
</p>
</li>
<li>
<p>
<em>%n</em>: newline
</p>
</li>
<li>
<p>
<em>%x00</em>: print a byte from a hex code
</p>
</li>
</ul></div>
</li>
<li>
<p>
<em>tformat:</em>
</p>
<div class="para"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
provides "terminator" semantics instead of "separator" semantics. In
other words, each commit has the message terminator character (usually a
newline) appended, rather than a separator placed between entries.
This means that the final entry of a single-line format will be properly
terminated with a new line, just as the "oneline" format does.
For example:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git log -2 --pretty=format:%h 4da45bef \
| perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
4da45be
7134973 -- NO NEWLINE
$ git log -2 --pretty=tformat:%h 4da45bef \
| perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
4da45be
7134973</tt></pre>
</div></div>
<div class="para"><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
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>
</div></div>
</li>
</ul></div>
</div>
<h2 id="_generating_patches_with_p">Generating patches with -p</h2>
<div class="sectionbody">
<div class="para"><p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
with a <em>-p</em> option, "git diff" without the <em>--raw</em> option, or
"git log" with the "-p" option, they
do not produce the output described above; instead they produce a
patch file. You can customize the creation of such patches via the
GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
<div class="para"><p>What the -p option produces is slightly different from the traditional
diff format.</p></div>
<div class="olist"><ol>
<li>
<p>
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>
</div></div>
<div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
involved. Especially, even for a creation or a deletion,
<tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
<div class="para"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> 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>
<li>
<p>
It is followed by one or more extended header lines:
</p>
<div class="literalblock">
<div class="content">
<pre><tt>old mode &lt;mode&gt;
new mode &lt;mode&gt;
deleted file mode &lt;mode&gt;
new file mode &lt;mode&gt;
copy from &lt;path&gt;
copy to &lt;path&gt;
rename from &lt;path&gt;
rename to &lt;path&gt;
similarity index &lt;number&gt;
dissimilarity index &lt;number&gt;
index &lt;hash&gt;..&lt;hash&gt; &lt;mode&gt;</tt></pre>
</div></div>
</li>
<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.
If there is need for such substitution then the whole
pathname is put in double quotes.
</p>
</li>
</ol></div>
<div class="para"><p>The similarity index is the percentage of unchanged lines, and
the dissimilarity index is the percentage of changed lines. It
is a rounded down integer, followed by a percent sign. The
similarity index value of 100% is thus reserved for two equal
files, while 100% dissimilarity means that no line from the old
file made it into the new one.</p></div>
</div>
<h2 id="_combined_diff_format">combined diff format</h2>
<div class="sectionbody">
<div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or
<em>--cc</em> option to produce <em>combined diff</em>. For showing a merge commit
with "git log -p", this is the default format.
A <em>combined diff</em> format looks like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>diff --combined describe.c
index fabadb8,cc95eb0..4866510
--- a/describe.c
+++ b/describe.c
@@@ -98,20 -98,12 +98,20 @@@
return (a_date &gt; b_date) ? -1 : (a_date == b_date) ? 0 : 1;
}
- static void describe(char *arg)
-static void describe(struct commit *cmit, int last_one)
++static void describe(char *arg, int last_one)
{
+ unsigned char sha1[20];
+ struct commit *cmit;
struct commit_list *list;
static int initialized = 0;
struct commit_name *n;
+ if (get_sha1(arg, sha1) &lt; 0)
+ usage(describe_usage);
+ cmit = lookup_commit_reference(sha1);
+ if (!cmit)
+ usage(describe_usage);
+
if (!initialized) {
initialized = 1;
for_each_ref(get_name);</tt></pre>
</div></div>
<div class="olist"><ol>
<li>
<p>
It is preceded with a "git diff" header, that looks like
this (when <em>-c</em> option is used):
</p>
<div class="literalblock">
<div class="content">
<pre><tt>diff --combined file</tt></pre>
</div></div>
<div class="para"><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>
</div></div>
</li>
<li>
<p>
It is followed by one or more extended header lines
(this example shows a merge with two parents):
</p>
<div class="literalblock">
<div class="content">
<pre><tt>index &lt;hash&gt;,&lt;hash&gt;..&lt;hash&gt;
mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;
new file mode &lt;mode&gt;
deleted file mode &lt;mode&gt;,&lt;mode&gt;</tt></pre>
</div></div>
<div class="para"><p>The <tt>mode &lt;mode&gt;,&lt;mode&gt;..&lt;mode&gt;</tt> line appears only if at least one of
the &lt;mode&gt; 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
&lt;tree-ish&gt; and are not used by combined diff format.</p></div>
</li>
<li>
<p>
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>
</div></div>
<div class="para"><p>Similar to two-line header for traditional <em>unified</em> diff
format, <tt>/dev/null</tt> 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
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>@@@ &lt;from-file-range&gt; &lt;from-file-range&gt; &lt;to-file-range&gt; @@@</tt></pre>
</div></div>
<div class="para"><p>There are (number of parents + 1) <tt>@</tt> characters in the chunk
header for combined diff format.</p></div>
</li>
</ol></div>
<div class="para"><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 &#8212;
appears in A but removed in B), <tt>+</tt> (plus &#8212; missing in A but
added to B), or <tt>" "</tt> (space &#8212; unchanged) prefix, this format
compares two or more files file1, file2,&#8230; 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="para"><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
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="para"><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
in either file1 nor file2). Also eight other lines are the same
from file1 but do not appear in file2 (hence prefixed with <tt>&#43;</tt>).</p></div>
<div class="para"><p>When shown by <tt>git diff-tree -c</tt>, 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
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>
<h2 id="_examples">Examples</h2>
<div class="sectionbody">
<div class="vlist"><dl>
<dt>
git log --no-merges
</dt>
<dd>
<p>
Show the whole commit history, but skip any merges
</p>
</dd>
<dt>
git log v2.6.12.. include/scsi drivers/scsi
</dt>
<dd>
<p>
Show all commits since version <em>v2.6.12</em> that changed any file
in the include/scsi or drivers/scsi subdirectories
</p>
</dd>
<dt>
git log --since="2 weeks ago" -- gitk
</dt>
<dd>
<p>
Show the changes during the last two weeks to the file <em>gitk</em>.
The "--" is necessary to avoid confusion with the <strong>branch</strong> named
<em>gitk</em>
</p>
</dd>
<dt>
git log --name-status release..test
</dt>
<dd>
<p>
Show the commits that are in the "test" branch but not yet
in the "release" branch, along with the list of paths
each commit modifies.
</p>
</dd>
<dt>
git log --follow builtin-rev-list.c
</dt>
<dd>
<p>
Shows the commits that changed builtin-rev-list.c, including
those commits that occurred before the file was given its
present name.
</p>
</dd>
</dl></div>
</div>
<h2 id="_discussion">Discussion</h2>
<div class="sectionbody">
<div class="para"><p>At the core level, git is character encoding agnostic.</p></div>
<div class="ilist"><ul>
<li>
<p>
The pathnames recorded in the index and in the tree objects
are treated as uninterpreted sequences of non-NUL bytes.
What readdir(2) returns are what are recorded and compared
with the data git keeps track of, which in turn are expected
to be what lstat(2) and creat(2) accepts. There is no such
thing as pathname encoding translation.
</p>
</li>
<li>
<p>
The contents of the blob objects are uninterpreted sequences
of bytes. There is no encoding translation at the core
level.
</p>
</li>
<li>
<p>
The commit log messages are uninterpreted sequences of non-NUL
bytes.
</p>
</li>
</ul></div>
<div class="para"><p>Although we encourage that the commit log messages are encoded
in UTF-8, both the core and git Porcelain are designed not to
force UTF-8 on projects. If all participants of a particular
project find it more convenient to use legacy encodings, git
does not forbid it. However, there are a few things to keep in
mind.</p></div>
<div class="olist"><ol>
<li>
<p>
<em>git-commit</em> and <em>git-commit-tree</em> issues
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:
</p>
<div class="listingblock">
<div class="content">
<pre><tt>[i18n]
commitencoding = ISO-8859-1</tt></pre>
</div></div>
<div class="para"><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
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
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:
</p>
<div class="listingblock">
<div class="content">
<pre><tt>[i18n]
logoutputencoding = ISO-8859-1</tt></pre>
</div></div>
<div class="para"><p>If you do not have this configuration variable, the value of
<tt>i18n.commitencoding</tt> is used instead.</p></div>
</li>
</ol></div>
<div class="para"><p>Note that we deliberately chose not to re-code the commit log
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>
<h2 id="_author">Author</h2>
<div class="sectionbody">
<div class="para"><p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;</p></div>
</div>
<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2009-04-08 07:36:11 UTC
</div>
</div>
</body>
</html>