<!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> <option>…</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> | |
<dd> | |
<p> | |
Generate patch (see section on generating patches). | |
</p> | |
</dd> | |
<dt> | |
-u | |
</dt> | |
<dd> | |
<p> | |
Synonym for "-p". | |
</p> | |
</dd> | |
<dt> | |
-U<n> | |
</dt> | |
<dd> | |
<p> | |
Shorthand for "--unified=<n>". | |
</p> | |
</dd> | |
<dt> | |
--unified=<n> | |
</dt> | |
<dd> | |
<p> | |
Generate diffs with <n> 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> | |
--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 only the sub-directories that are impacted by a diff, | |
and to what degree they are impacted. You can override the | |
default cut-off in percent (3) by "--dirstat=limit". If you | |
want to enable "cumulative" directory statistics, you can use | |
the "--cumulative" flag, which adds up percentages recursively | |
even when they have been already reported for a sub-directory. | |
</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 | |
</dt> | |
<dd> | |
<p> | |
Show colored word diff, i.e. color words which have changed. | |
</p> | |
</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 characters, show full | |
object name of pre- and post-image blob on the "index" | |
line when generating a 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[=<n>] | |
</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 handful hexdigits 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=<n>. | |
</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 (mode) 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<num> | |
</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<string> | |
</dt> | |
<dd> | |
<p> | |
Look for differences that contain the change in <string>. | |
</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 <string>. | |
</p> | |
</dd> | |
<dt> | |
--pickaxe-regex | |
</dt> | |
<dd> | |
<p> | |
Make the <string> not a plain string but an extended POSIX | |
regex to match. | |
</p> | |
</dd> | |
<dt> | |
-O<orderfile> | |
</dt> | |
<dd> | |
<p> | |
Output the patch in the order specified in the | |
<orderfile>, 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[=<path>] | |
</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 <path> as an argument. | |
</p> | |
</dd> | |
<dt> | |
--text | |
</dt> | |
<dd> | |
<p> | |
Treat all files as text. | |
</p> | |
</dd> | |
<dt> | |
-a | |
</dt> | |
<dd> | |
<p> | |
Shorthand for "--text". | |
</p> | |
</dd> | |
<dt> | |
--ignore-space-at-eol | |
</dt> | |
<dd> | |
<p> | |
Ignore changes in whitespace at EOL. | |
</p> | |
</dd> | |
<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> | |
-b | |
</dt> | |
<dd> | |
<p> | |
Shorthand for "--ignore-space-change". | |
</p> | |
</dd> | |
<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> | |
-w | |
</dt> | |
<dd> | |
<p> | |
Shorthand for "--ignore-all-space". | |
</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=<prefix> | |
</dt> | |
<dd> | |
<p> | |
Show the given source prefix instead of "a/". | |
</p> | |
</dd> | |
<dt> | |
--dst-prefix=<prefix> | |
</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> | |
-<n> | |
</dt> | |
<dd> | |
<p> | |
Limits the number of commits to show. | |
</p> | |
</dd> | |
<dt> | |
<since>..<until> | |
</dt> | |
<dd> | |
<p> | |
Show only commits between the named two commits. When | |
either <since> or <until> is omitted, it defaults to | |
<tt>HEAD</tt>, i.e. the tip of the current branch. | |
For a more complete list of ways to spell <since> | |
and <until>, 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> | |
--full-diff | |
</dt> | |
<dd> | |
<p> | |
Without this flag, "git log -p <paths>…" 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 "<paths>…" 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> | |
<paths>… | |
</dt> | |
<dd> | |
<p> | |
Show only commits that affect the specified paths. | |
</p> | |
</dd> | |
</dl></div> | |
<h3 id="_commit_formatting">Commit Formatting</h3><div style="clear:left"></div> | |
<div class="vlist"><dl> | |
<dt> | |
--pretty[=<em><format></em>] | |
</dt> | |
<dd> | |
<p> | |
Pretty-print the contents of the commit logs in a given format, | |
where <em><format></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:<string></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 handful hexdigits prefix. Non default number of | |
digits can be specified with "--abbrev=<n>" (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> | |
--encoding[=<encoding>] | |
</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} | |
</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=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. | |
</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><</tt> and those from | |
the right with <tt>></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 line this:</p></div> | |
<div class="listingblock"> | |
<div class="content"> | |
<pre><tt> $ 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> | |
</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 hunks that show differences from only | |
one parent, or show the same change from all but one parent for | |
an Octopus merge. | |
</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=<em>number</em> | |
</dt> | |
<dd> | |
<p> | |
Limit the number of commits output. | |
</p> | |
</dd> | |
<dt> | |
--skip=<em>number</em> | |
</dt> | |
<dd> | |
<p> | |
Skip <em>number</em> commits before starting to show the commit output. | |
</p> | |
</dd> | |
<dt> | |
--since=<em>date</em> | |
</dt> | |
<dt> | |
--after=<em>date</em> | |
</dt> | |
<dd> | |
<p> | |
Show commits more recent than a specific date. | |
</p> | |
</dd> | |
<dt> | |
--until=<em>date</em> | |
</dt> | |
<dt> | |
--before=<em>date</em> | |
</dt> | |
<dd> | |
<p> | |
Show commits older than a specific date. | |
</p> | |
</dd> | |
<dt> | |
--author=<em>pattern</em> | |
</dt> | |
<dt> | |
--committer=<em>pattern</em> | |
</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=<em>pattern</em> | |
</dt> | |
<dd> | |
<p> | |
Limit the commits output to ones with log message that | |
matches the specified pattern (regular expression). | |
</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> | |
--full-history | |
</dt> | |
<dd> | |
<p> | |
Show also parts of history irrelevant to current state of a given | |
path. This turns off history simplification, which removed merges | |
which didn't change anything at all at some child. It will still actually | |
simplify away merges that didn't change anything at all into either | |
child. | |
</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>^</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><commit></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>^commit</em>, <em>commit1..commit2</em>, | |
nor <em>commit1…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 | |
instead. Under <em>--pretty=oneline</em>, the commit message is | |
prefixed with this information on the same line. | |
</p> | |
<div class="para"><p>Cannot be combined with <em>--reverse</em>. | |
See also <a href="git-reflog.html">git-reflog(1)</a>.</p></div> | |
</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> | |
<dt> | |
--dense | |
</dt> | |
<dt> | |
--sparse | |
</dt> | |
<dd> | |
<p> | |
When optional paths are given, the default behaviour (<em>--dense</em>) is to | |
only output commits that changes at least one of them, and also ignore | |
merges that do not touch the given paths. | |
</p> | |
<div class="para"><p>Use the <em>--sparse</em> flag to makes the command output all eligible commits | |
(still subject to count and age limitation), but apply merge | |
simplification nevertheless.</p></div> | |
</dd> | |
</dl></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><sha1> <title line></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 <sha1> | |
Author: <author></tt></pre> | |
</div></div> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><tt><title line></tt></pre> | |
</div></div> | |
</li> | |
<li> | |
<p> | |
<em>medium</em> | |
</p> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><tt>commit <sha1> | |
Author: <author> | |
Date: <author date></tt></pre> | |
</div></div> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><tt><title line></tt></pre> | |
</div></div> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><tt><full commit message></tt></pre> | |
</div></div> | |
</li> | |
<li> | |
<p> | |
<em>full</em> | |
</p> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><tt>commit <sha1> | |
Author: <author> | |
Commit: <committer></tt></pre> | |
</div></div> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><tt><title line></tt></pre> | |
</div></div> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><tt><full commit message></tt></pre> | |
</div></div> | |
</li> | |
<li> | |
<p> | |
<em>fuller</em> | |
</p> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><tt>commit <sha1> | |
Author: <author> | |
AuthorDate: <author date> | |
Commit: <committer> | |
CommitDate: <committer date></tt></pre> | |
</div></div> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><tt><title line></tt></pre> | |
</div></div> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><tt><full commit message></tt></pre> | |
</div></div> | |
</li> | |
<li> | |
<p> | |
<em>email</em> | |
</p> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><tt>From <sha1> <date> | |
From: <author> | |
Date: <author date> | |
Subject: [PATCH] <title line></tt></pre> | |
</div></div> | |
<div class="literalblock"> | |
<div class="content"> | |
<pre><tt><full commit message></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 >>%s<<%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 >>t4119: test autocomputing -p<n> for traditional diff input.<< | |
</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>%ae</em>: author email | |
</p> | |
</li> | |
<li> | |
<p> | |
<em>%ad</em>: author date | |
</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>%ce</em>: committer email | |
</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>%e</em>: encoding | |
</p> | |
</li> | |
<li> | |
<p> | |
<em>%s</em>: subject | |
</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>%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> | |
</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 <em>not</em> 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 <mode> | |
new mode <mode> | |
deleted file mode <mode> | |
new file mode <mode> | |
copy from <path> | |
copy to <path> | |
rename from <path> | |
rename to <path> | |
similarity index <number> | |
dissimilarity index <number> | |
index <hash>..<hash> <mode></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 > 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) < 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 --c 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 <hash>,<hash>..<hash> | |
mode <mode>,<mode>..<mode> | |
new file mode <mode> | |
deleted file mode <mode>,<mode></tt></pre> | |
</div></div> | |
<div class="para"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of | |
the <mode> is different from the rest. Extended headers with | |
information about detected contents movement (renames and | |
copying detection) are designed to work with diff of two | |
<tree-ish> 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>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</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 — | |
appears in A but removed in B), <tt>+</tt> (plus — missing in A but | |
added to B), or <tt>" "</tt> (space — unchanged) prefix, this format | |
compares two or more files file1, file2,… with one file X, and | |
shows how X differs from each of fileN. One column for each of | |
fileN is prepended to the output line to note how X's line is | |
different from it.</p></div> | |
<div class="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 last file, | |
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>+</tt> to mean one line that was added does not appear | |
in either file1 nor file2). Also two other lines are the same | |
from file1 but do not appear in file2 (hence prefixed with <tt> </tt></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 sequence | |
of bytes. There is no encoding translation at the core | |
level. | |
</p> | |
</li> | |
<li> | |
<p> | |
The commit log messages are uninterpreted sequence 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-tree</em> (hence, <em>git-commit</em> which uses it) 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> and friends looks at the <tt>encoding</tt> | |
header of a commit object, and tries 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 <torvalds@osdl.org></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 <git@vger.kernel.org>.</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 2008-07-06 05:16:51 UTC | |
</div> | |
</div> | |
</body> | |
</html> |