diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 15:32:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 15:32:51 -0700 |
| commit | ac12f0ed6289c50e645af6dfb6e063776bc0f428 (patch) | |
| tree | 9033ab4b78ce9c9122fbe9b5abcf23d596ea24fd /git-diff-tree.html | |
| parent | c3f8d8ffe5fd51ed0a3dae59dd8b78f61d7b43d2 (diff) | |
| download | git-htmldocs-ac12f0ed6289c50e645af6dfb6e063776bc0f428.tar.gz | |
Autogenerated HTML docs for v2.1.1-273-g97b886
Diffstat (limited to 'git-diff-tree.html')
| -rw-r--r-- | git-diff-tree.html | 470 |
1 files changed, 239 insertions, 231 deletions
diff --git a/git-diff-tree.html b/git-diff-tree.html index 542a9aa2d..3728e549e 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.6" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
<title>git-diff-tree(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,10 +87,16 @@ ul, ol, li > p { ul > li { color: #aaa; }
ul > li > * { color: black; }
-pre {
+.monospaced, code, pre {
+ font-family: "Courier New", Courier, monospace;
+ font-size: inherit;
+ color: navy;
padding: 0;
margin: 0;
}
+pre {
+ white-space: pre-wrap;
+}
#author {
color: #527bbd;
@@ -219,7 +225,7 @@ div.exampleblock > div.content { }
div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
+span.image img { border-style: none; vertical-align: text-bottom; }
a.image:visited { color: white; }
dl {
@@ -349,7 +355,7 @@ div.colist td img { margin-bottom: 0.1em;
}
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
@@ -407,18 +413,14 @@ span.underline { text-decoration: underline; } span.overline { text-decoration: overline; }
span.line-through { text-decoration: line-through; }
+div.unbreakable { page-break-inside: avoid; }
+
/*
* xhtml11 specific
*
* */
-tt {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
div.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -452,12 +454,6 @@ div.tableblock > table[frame="vsides"] { *
* */
-.monospaced {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
table.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -537,6 +533,8 @@ body.manpage div.sectionbody { @media print {
body.manpage div#toc { display: none; }
}
+
+
</style>
<script type="text/javascript">
/*<+'])');
+ var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
// Function that scans the DOM tree for header elements (the DOM2
// nodeIterator API would be a better technique but not supported by all
// browsers).
@@ -610,7 +608,7 @@ toc: function (toclevels) { var i;
for (i = 0; i < toc.childNodes.length; i++) {
var entry = toc.childNodes[i];
- if (entry.nodeName == 'div'
+ if (entry.nodeName.toLowerCase() == 'div'
&& entry.getAttribute("class")
&& entry.getAttribute("class").match(/^toclevel/))
tocEntriesToRemove.push(entry);
@@ -656,7 +654,7 @@ footnotes: function () { var entriesToRemove = [];
for (i = 0; i < noteholder.childNodes.length; i++) {
var entry = noteholder.childNodes[i];
- if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote")
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
entriesToRemove.push(entry);
}
for (i = 0; i < entriesToRemove.length; i++) {
@@ -793,8 +791,8 @@ git-diff-tree(1) Manual Page </dt>
<dd>
<p>
- Suppress diff output. Useful for commands like <tt>git show</tt> that
- show the patch by default, or to cancel the effect of <tt>--patch</tt>.
+ Suppress diff output. Useful for commands like <code>git show</code> that
+ show the patch by default, or to cancel the effect of <code>--patch</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -807,7 +805,7 @@ git-diff-tree(1) Manual Page <p>
Generate diffs with <n> lines of context instead of
the usual three.
- Implies <tt>-p</tt>.
+ Implies <code>-p</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -824,7 +822,7 @@ git-diff-tree(1) Manual Page </dt>
<dd>
<p>
- Synonym for <tt>-p --raw</tt>.
+ Synonym for <code>-p --raw</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -863,7 +861,7 @@ git-diff-tree(1) Manual Page <div class="content">
<div class="dlist"><dl>
<dt class="hdlist1">
-<tt>default</tt>, <tt>myers</tt>
+<code>default</code>, <code>myers</code>
</dt>
<dd>
<p>
@@ -871,7 +869,7 @@ git-diff-tree(1) Manual Page </p>
</dd>
<dt class="hdlist1">
-<tt>minimal</tt>
+<code>minimal</code>
</dt>
<dd>
<p>
@@ -880,7 +878,7 @@ git-diff-tree(1) Manual Page </p>
</dd>
<dt class="hdlist1">
-<tt>patience</tt>
+<code>patience</code>
</dt>
<dd>
<p>
@@ -888,7 +886,7 @@ git-diff-tree(1) Manual Page </p>
</dd>
<dt class="hdlist1">
-<tt>histogram</tt>
+<code>histogram</code>
</dt>
<dd>
<p>
@@ -900,7 +898,7 @@ git-diff-tree(1) Manual Page </div></div>
<div class="paragraph"><p>For instance, if you configured diff.algorithm variable to a
non-default value and want to use the default one, then you
-have to use <tt>--diff-algorithm=default</tt> option.</p></div>
+have to use <code>--diff-algorithm=default</code> option.</p></div>
</dd>
<dt class="hdlist1">
--stat[=<width>[,<name-width>[,<count>]]]
@@ -911,29 +909,29 @@ have to use <tt>--diff-algorithm=default</tt> option.</p></div> will be used for the filename part, and the rest for the graph
part. Maximum width defaults to terminal width, or 80 columns
if not connected to a terminal, and can be overridden by
- <tt><width></tt>. The width of the filename part can be limited by
- giving another width <tt><name-width></tt> after a comma. The width
+ <code><width></code>. The width of the filename part can be limited by
+ giving another width <code><name-width></code> after a comma. The width
of the graph part can be limited by using
- <tt>--stat-graph-width=<width></tt> (affects all commands generating
- a stat graph) or by setting <tt>diff.statGraphWidth=<width></tt>
- (does not affect <tt>git format-patch</tt>).
- By giving a third parameter <tt><count></tt>, you can limit the
- output to the first <tt><count></tt> lines, followed by <tt>...</tt> if
+ <code>--stat-graph-width=<width></code> (affects all commands generating
+ a stat graph) or by setting <code>diff.statGraphWidth=<width></code>
+ (does not affect <code>git format-patch</code>).
+ By giving a third parameter <code><count></code>, you can limit the
+ output to the first <code><count></code> lines, followed by <code>...</code> if
there are more.
</p>
-<div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=<width></tt>,
-<tt>--stat-name-width=<name-width></tt> and <tt>--stat-count=<count></tt>.</p></div>
+<div class="paragraph"><p>These parameters can also be set individually with <code>--stat-width=<width></code>,
+<code>--stat-name-width=<name-width></code> and <code>--stat-count=<count></code>.</p></div>
</dd>
<dt class="hdlist1">
--numstat
</dt>
<dd>
<p>
- Similar to <tt>--stat</tt>, but shows number of added and
+ Similar to <code>--stat</code>, but shows number of added and
deleted lines in decimal notation and pathname without
abbreviation, to make it more machine friendly. For
- binary files, outputs two <tt>-</tt> instead of saying
- <tt>0 0</tt>.
+ binary files, outputs two <code>-</code> instead of saying
+ <code>0 0</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -941,7 +939,7 @@ have to use <tt>--diff-algorithm=default</tt> option.</p></div> </dt>
<dd>
<p>
- Output only the last line of the <tt>--stat</tt> format containing total
+ Output only the last line of the <code>--stat</code> format containing total
number of modified files, as well as number of added and deleted
lines.
</p>
@@ -952,9 +950,9 @@ have to use <tt>--diff-algorithm=default</tt> option.</p></div> <dd>
<p>
Output the distribution of relative amount of changes for each
- sub-directory. The behavior of <tt>--dirstat</tt> can be customized by
+ sub-directory. The behavior of <code>--dirstat</code> can be customized by
passing it a comma separated list of parameters.
- The defaults are controlled by the <tt>diff.dirstat</tt> configuration
+ The defaults are controlled by the <code>diff.dirstat</code> configuration
variable (see <a href="git-config.html">git-config(1)</a>).
The following parameters are available:
</p>
@@ -962,7 +960,7 @@ have to use <tt>--diff-algorithm=default</tt> option.</p></div> <div class="content">
<div class="dlist"><dl>
<dt class="hdlist1">
-<tt>changes</tt>
+<code>changes</code>
</dt>
<dd>
<p>
@@ -974,39 +972,39 @@ have to use <tt>--diff-algorithm=default</tt> option.</p></div> </p>
</dd>
<dt class="hdlist1">
-<tt>lines</tt>
+<code>lines</code>
</dt>
<dd>
<p>
Compute the dirstat numbers by doing the regular line-based diff
analysis, and summing the removed/added line counts. (For binary
files, count 64-byte chunks instead, since binary files have no
- natural concept of lines). This is a more expensive <tt>--dirstat</tt>
- behavior than the <tt>changes</tt> behavior, but it does count rearranged
+ natural concept of lines). This is a more expensive <code>--dirstat</code>
+ behavior than the <code>changes</code> behavior, but it does count rearranged
lines within a file as much as other changes. The resulting output
- is consistent with what you get from the other <tt>--*stat</tt> options.
+ is consistent with what you get from the other <code>--*stat</code> options.
</p>
</dd>
<dt class="hdlist1">
-<tt>files</tt>
+<code>files</code>
</dt>
<dd>
<p>
Compute the dirstat numbers by counting the number of files changed.
Each changed file counts equally in the dirstat analysis. This is
- the computationally cheapest <tt>--dirstat</tt> behavior, since it does
+ the computationally cheapest <code>--dirstat</code> behavior, since it does
not have to look at the file contents at all.
</p>
</dd>
<dt class="hdlist1">
-<tt>cumulative</tt>
+<code>cumulative</code>
</dt>
<dd>
<p>
Count changes in a child directory for the parent directory as well.
- Note that when using <tt>cumulative</tt>, the sum of the percentages
+ Note that when using <code>cumulative</code>, the sum of the percentages
reported may exceed 100%. The default (non-cumulative) behavior can
- be specified with the <tt>noncumulative</tt> parameter.
+ be specified with the <code>noncumulative</code> parameter.
</p>
</dd>
<dt class="hdlist1">
@@ -1024,7 +1022,7 @@ have to use <tt>--diff-algorithm=default</tt> option.</p></div> <div class="paragraph"><p>Example: The following will count changed files, while ignoring
directories with less than 10% of the total amount of changed files,
and accumulating child directory counts in the parent directories:
-<tt>--dirstat=files,10,cumulative</tt>.</p></div>
+<code>--dirstat=files,10,cumulative</code>.</p></div>
</dd>
<dt class="hdlist1">
--summary
@@ -1040,7 +1038,7 @@ and accumulating child directory counts in the parent directories: </dt>
<dd>
<p>
- Synonym for <tt>-p --stat</tt>.
+ Synonym for <code>-p --stat</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1048,11 +1046,11 @@ and accumulating child directory counts in the parent directories: </dt>
<dd>
<p>
- When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
+ When <code>--raw</code>, <code>--numstat</code>, <code>--name-only</code> or <code>--name-status</code> has been
given, do not munge pathnames and use NULs as output field terminators.
</p>
<div class="paragraph"><p>Without this option, each pathname output will have TAB, LF, double quotes,
-and backslash characters replaced with <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt>, and <tt>\\</tt>,
+and backslash characters replaced with <code>\t</code>, <code>\n</code>, <code>\"</code>, and <code>\\</code>,
respectively, and the pathname will be enclosed in double quotes if
any of those replacements occurred.</p></div>
</dd>
@@ -1070,7 +1068,7 @@ any of those replacements occurred.</p></div> <dd>
<p>
Show only names and status of changed files. See the description
- of the <tt>--diff-filter</tt> option on what the status letters mean.
+ of the <code>--diff-filter</code> option on what the status letters mean.
</p>
</dd>
<dt class="hdlist1">
@@ -1078,13 +1076,13 @@ any of those replacements occurred.</p></div> </dt>
<dd>
<p>
- Specify how differences in submodules are shown. When <tt>--submodule</tt>
- or <tt>--submodule=log</tt> is given, the <em>log</em> format is used. This format lists
- the commits in the range like <a href="git-submodule.html">git-submodule(1)</a> <tt>summary</tt> does.
- Omitting the <tt>--submodule</tt> option or specifying <tt>--submodule=short</tt>,
+ Specify how differences in submodules are shown. When <code>--submodule</code>
+ or <code>--submodule=log</code> is given, the <em>log</em> format is used. This format lists
+ the commits in the range like <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does.
+ Omitting the <code>--submodule</code> option or specifying <code>--submodule=short</code>,
uses the <em>short</em> format. This format just shows the names of the commits
at the beginning and end of the range. Can be tweaked via the
- <tt>diff.submodule</tt> configuration variable.
+ <code>diff.submodule</code> configuration variable.
</p>
</dd>
<dt class="hdlist1">
@@ -1093,8 +1091,8 @@ any of those replacements occurred.</p></div> <dd>
<p>
Show colored diff.
- <tt>--color</tt> (i.e. without <em>=<when></em>) is the same as <tt>--color=always</tt>.
- <em><when></em> can be one of <tt>always</tt>, <tt>never</tt>, or <tt>auto</tt>.
+ <code>--color</code> (i.e. without <em>=<when></em>) is the same as <code>--color=always</code>.
+ <em><when></em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1103,7 +1101,7 @@ any of those replacements occurred.</p></div> <dd>
<p>
Turn off colored diff.
- It is the same as <tt>--color=never</tt>.
+ It is the same as <code>--color=never</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1113,7 +1111,7 @@ any of those replacements occurred.</p></div> <p>
Show a word diff, using the <mode> to delimit changed words.
By default, words are delimited by whitespace; see
- <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
+ <code>--word-diff-regex</code> below. The <mode> defaults to <em>plain</em>, and
must be one of:
</p>
<div class="openblock">
@@ -1124,7 +1122,7 @@ color </dt>
<dd>
<p>
- Highlight changed words using only colors. Implies <tt>--color</tt>.
+ Highlight changed words using only colors. Implies <code>--color</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1132,7 +1130,7 @@ plain </dt>
<dd>
<p>
- Show words as <tt>[-removed-]</tt> and <tt>{+added+}</tt>. Makes no
+ Show words as <code>[-removed-]</code> and <code>{+added+}</code>. Makes no
attempts to escape the delimiters if they appear in the input,
so the output may be ambiguous.
</p>
@@ -1144,10 +1142,10 @@ porcelain <p>
Use a special line-based format intended for script
consumption. Added/removed/unchanged runs are printed in the
- usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
+ usual unified diff format, starting with a <code>+</code>/<code>-</code>/` `
character at the beginning of the line and extending to the
end of the line. Newlines in the input are represented by a
- tilde <tt>~</tt> on a line of its own.
+ tilde <code>~</code> on a line of its own.
</p>
</dd>
<dt class="hdlist1">
@@ -1170,12 +1168,12 @@ highlight the changed parts in all modes if enabled.</p></div> <p>
Use <regex> to decide what a word is, instead of considering
runs of non-whitespace to be a word. Also implies
- <tt>--word-diff</tt> unless it was already enabled.
+ <code>--word-diff</code> unless it was already enabled.
</p>
<div class="paragraph"><p>Every non-overlapping match of the
<regex> is considered a word. Anything between these matches is
considered whitespace and ignored(!) for the purposes of finding
-differences. You may want to append <tt>|[^[:space:]]</tt> to your regular
+differences. You may want to append <code>|[^[:space:]]</code> to your regular
expression to make sure that it matches all non-whitespace characters.
A match that contains a newline is silently truncated(!) at the
newline.</p></div>
@@ -1189,8 +1187,8 @@ override configuration settings.</p></div> </dt>
<dd>
<p>
- Equivalent to <tt>--word-diff=color</tt> plus (if a regex was
- specified) <tt>--word-diff-regex=<regex></tt>.
+ Equivalent to <code>--word-diff=color</code> plus (if a regex was
+ specified) <code>--word-diff-regex=<regex></code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1208,7 +1206,7 @@ override configuration settings.</p></div> <dd>
<p>
Warn if changes introduce whitespace errors. What are
- considered whitespace errors is controlled by <tt>core.whitespace</tt>
+ considered whitespace errors is controlled by <code>core.whitespace</code>
configuration. By default, trailing whitespaces (including
lines that solely consist of whitespaces) and a space character
that is immediately followed by a tab character inside the
@@ -1232,8 +1230,8 @@ override configuration settings.</p></div> </dt>
<dd>
<p>
- In addition to <tt>--full-index</tt>, output a binary diff that
- can be applied with <tt>git-apply</tt>.
+ In addition to <code>--full-index</code>, output a binary diff that
+ can be applied with <code>git-apply</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1244,9 +1242,9 @@ override configuration settings.</p></div> Instead of showing the full 40-byte hexadecimal object
name in diff-raw format output and diff-tree header
lines, show only a partial prefix. This is
- independent of the <tt>--full-index</tt> option above, which controls
+ independent of the <code>--full-index</code> option above, which controls
the diff-patch output format. Non default number of
- digits can be specified with <tt>--abbrev=<n></tt>.
+ digits can be specified with <code>--abbrev=<n></code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1264,15 +1262,15 @@ override configuration settings.</p></div> not as a series of deletion and insertion mixed together with a very
few lines that happen to match textually as the context, but as a
single deletion of everything old followed by a single insertion of
-everything new, and the number <tt>m</tt> controls this aspect of the -B
-option (defaults to 60%). <tt>-B/70%</tt> specifies that less than 30% of the
+everything new, and the number <code>m</code> controls this aspect of the -B
+option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
original should remain in the result for Git to consider it a total
rewrite (i.e. otherwise the resulting patch will be a series of
deletion and insertion mixed together with context lines).</p></div>
<div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
source of a rename (usually -M only considers a file that disappeared
-as the source of a rename), and the number <tt>n</tt> controls this aspect of
-the -B option (defaults to 50%). <tt>-B20%</tt> specifies that a change with
+as the source of a rename), and the number <code>n</code> controls this aspect of
+the -B option (defaults to 50%). <code>-B20%</code> specifies that a change with
addition and deletion compared to 20% or more of the file’s size are
eligible for being picked up as a possible source of a rename to
another file.</p></div>
@@ -1286,15 +1284,15 @@ another file.</p></div> <dd>
<p>
Detect renames.
- If <tt>n</tt> is specified, it is a threshold on the similarity
+ If <code>n</code> is specified, it is a threshold on the similarity
index (i.e. amount of addition/deletions compared to the
- file’s size). For example, <tt>-M90%</tt> means Git should consider a
+ file’s size). For example, <code>-M90%</code> means Git should consider a
delete/add pair to be a rename if more than 90% of the file
- hasn’t changed. Without a <tt>%</tt> sign, the number is to be read as
- a fraction, with a decimal point before it. I.e., <tt>-M5</tt> becomes
- 0.5, and is thus the same as <tt>-M50%</tt>. Similarly, <tt>-M05</tt> is
- the same as <tt>-M5%</tt>. To limit detection to exact renames, use
- <tt>-M100%</tt>. The default similarity index is 50%.
+ hasn’t changed. Without a <code>%</code> sign, the number is to be read as
+ a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
+ 0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is
+ the same as <code>-M5%</code>. To limit detection to exact renames, use
+ <code>-M100%</code>. The default similarity index is 50%.
</p>
</dd>
<dt class="hdlist1">
@@ -1305,8 +1303,8 @@ another file.</p></div> </dt>
<dd>
<p>
- Detect copies as well as renames. See also <tt>--find-copies-harder</tt>.
- If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
+ Detect copies as well as renames. See also <code>--find-copies-harder</code>.
+ If <code>n</code> is specified, it has the same meaning as for <code>-M<n></code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1314,13 +1312,13 @@ another file.</p></div> </dt>
<dd>
<p>
- For performance reasons, by default, <tt>-C</tt> option finds copies only
+ For performance reasons, by default, <code>-C</code> option finds copies only
if the original file of the copy was modified in the same
changeset. This flag makes the command
inspect unmodified files as candidates for the source of
copy. This is a very expensive operation for large
projects, so use it with caution. Giving more than one
- <tt>-C</tt> option has the same effect.
+ <code>-C</code> option has the same effect.
</p>
</dd>
<dt class="hdlist1">
@@ -1332,14 +1330,14 @@ another file.</p></div> <dd>
<p>
Omit the preimage for deletes, i.e. print only the header but not
- the diff between the preimage and <tt>/dev/null</tt>. The resulting patch
- is not meant to be applied with <tt>patch</tt> or <tt>git apply</tt>; this is
+ the diff between the preimage and <code>/dev/null</code>. The resulting patch
+ is not meant to be applied with <code>patch</code> or <code>git apply</code>; this is
solely for people who want to just concentrate on reviewing the
text after the change. In addition, the output obviously lack
enough information to apply such a patch in reverse, even manually,
hence the name of the option.
</p>
-<div class="paragraph"><p>When used together with <tt>-B</tt>, omit also the preimage in the deletion part
+<div class="paragraph"><p>When used together with <code>-B</code>, omit also the preimage in the deletion part
of a delete/create pair.</p></div>
</dd>
<dt class="hdlist1">
@@ -1347,7 +1345,7 @@ of a delete/create pair.</p></div> </dt>
<dd>
<p>
- The <tt>-M</tt> and <tt>-C</tt> options require O(n^2) processing time where n
+ The <code>-M</code> and <code>-C</code> options require O(n^2) processing time where n
is the number of potential rename/copy targets. This
option prevents rename/copy detection from running if
the number of rename/copy targets exceeds the specified
@@ -1359,13 +1357,13 @@ of a delete/create pair.</p></div> </dt>
<dd>
<p>
- Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
- Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
- type (i.e. regular file, symlink, submodule, …) changed (<tt>T</tt>),
- are Unmerged (<tt>U</tt>), are
- Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
+ Select only files that are Added (<code>A</code>), Copied (<code>C</code>),
+ Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their
+ type (i.e. regular file, symlink, submodule, …) changed (<code>T</code>),
+ are Unmerged (<code>U</code>), are
+ Unknown (<code>X</code>), or have had their pairing Broken (<code>B</code>).
Any combination of the filter characters (including none) can be used.
- When <tt>*</tt> (All-or-none) is added to the combination, all
+ When <code>*</code> (All-or-none) is added to the combination, all
paths are selected if there is any file that matches
other criteria in the comparison; if there is no file
that matches other criteria, nothing is selected.
@@ -1383,7 +1381,7 @@ of a delete/create pair.</p></div> <div class="paragraph"><p>It is useful when you’re looking for an exact block of code (like a
struct), and want to know the history of that block since it first
came into being: use the feature iteratively to feed the interesting
-block in the preimage back into <tt>-S</tt>, and keep going until you get the
+block in the preimage back into <code>-S</code>, and keep going until you get the
very first version of the block.</p></div>
</dd>
<dt class="hdlist1">
@@ -1394,17 +1392,17 @@ very first version of the block.</p></div> Look for differences whose patch text contains added/removed
lines that match <regex>.
</p>
-<div class="paragraph"><p>To illustrate the difference between <tt>-S<regex> --pickaxe-regex</tt> and
-<tt>-G<regex></tt>, consider a commit with the following diff in the same
+<div class="paragraph"><p>To illustrate the difference between <code>-S<regex> --pickaxe-regex</code> and
+<code>-G<regex></code>, consider a commit with the following diff in the same
file:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>+ return !regexec(regexp, two->ptr, 1, &regmatch, 0);
+<pre><code>+ return !regexec(regexp, two->ptr, 1, &regmatch, 0);
...
-- hit = !regexec(regexp, mf2.ptr, 1, &regmatch, 0);</tt></pre>
+- hit = !regexec(regexp, mf2.ptr, 1, &regmatch, 0);</code></pre>
</div></div>
-<div class="paragraph"><p>While <tt>git log -G"regexec\(regexp"</tt> will show this commit, <tt>git log
--S"regexec\(regexp" --pickaxe-regex</tt> will not (because the number of
+<div class="paragraph"><p>While <code>git log -G"regexec\(regexp"</code> will show this commit, <code>git log
+-S"regexec\(regexp" --pickaxe-regex</code> will not (because the number of
occurrences of that string did not change).</p></div>
<div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
information.</p></div>
@@ -1414,7 +1412,7 @@ information.</p></div> </dt>
<dd>
<p>
- When <tt>-S</tt> or <tt>-G</tt> finds a change, show all the changes in that
+ When <code>-S</code> or <code>-G</code> finds a change, show all the changes in that
changeset, not just the files that contain the change
in <string>.
</p>
@@ -1424,7 +1422,7 @@ information.</p></div> </dt>
<dd>
<p>
- Treat the <string> given to <tt>-S</tt> as an extended POSIX regular
+ Treat the <string> given to <code>-S</code> as an extended POSIX regular
expression to match.
</p>
</dd>
@@ -1435,9 +1433,9 @@ information.</p></div> <p>
Output the patch in the order specified in the
<orderfile>, which has one shell glob pattern per line.
- This overrides the <tt>diff.orderfile</tt> configuration variable
- (see <a href="git-config.html">git-config(1)</a>). To cancel <tt>diff.orderfile</tt>,
- use <tt>-O/dev/null</tt>.
+ This overrides the <code>diff.orderfile</code> configuration variable
+ (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderfile</code>,
+ use <code>-O/dev/null</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1550,7 +1548,7 @@ information.</p></div> </dt>
<dd>
<p>
- Disable all output of the program. Implies <tt>--exit-code</tt>.
+ Disable all output of the program. Implies <code>--exit-code</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -1650,7 +1648,7 @@ information.</p></div> <p>
If provided, the results are limited to a subset of files
matching one of these prefix strings.
- i.e., file matches <tt>/^<pattern1>|<pattern2>|.../</tt>
+ i.e., file matches <code>/^<pattern1>|<pattern2>|.../</code>
Note that this parameter does not provide any wildcard or regexp
features.
</p>
@@ -1769,7 +1767,7 @@ people using 80-column terminals.</p></div> <dd>
<p>
Show the full 40-byte hexadecimal commit object name. This negates
- <tt>--abbrev-commit</tt> and those options which imply it such as
+ <code>--abbrev-commit</code> and those options which imply it such as
"--oneline". It also overrides the <em>log.abbrevCommit</em> variable.
</p>
</dd>
@@ -1801,15 +1799,15 @@ people using 80-column terminals.</p></div> <p>
Show the notes (see <a href="git-notes.html">git-notes(1)</a>) that annotate the
commit, when showing the commit log message. This is the default
- for <tt>git log</tt>, <tt>git show</tt> and <tt>git whatchanged</tt> commands when
- there is no <tt>--pretty</tt>, <tt>--format</tt>, or <tt>--oneline</tt> option given
+ for <code>git log</code>, <code>git show</code> and <code>git whatchanged</code> commands when
+ there is no <code>--pretty</code>, <code>--format</code>, or <code>--oneline</code> option given
on the command line.
</p>
<div class="paragraph"><p>By default, the notes shown are from the notes refs listed in the
<em>core.notesRef</em> and <em>notes.displayRef</em> variables (or corresponding
environment overrides). See <a href="git-config.html">git-config(1)</a> for more details.</p></div>
<div class="paragraph"><p>With an optional <em><ref></em> argument, show this notes ref instead of the
-default notes ref(s). The ref is taken to be in <tt>refs/notes/</tt> if it
+default notes ref(s). The ref is taken to be in <code>refs/notes/</code> if it
is not qualified.</p></div>
<div class="paragraph"><p>Multiple --notes options can be combined to control which notes are
being displayed. Examples: "--notes=foo" will show only notes from
@@ -1821,7 +1819,7 @@ being displayed. Examples: "--notes=foo" will show only notes from </dt>
<dd>
<p>
- Do not show notes. This negates the above <tt>--notes</tt> option, by
+ Do not show notes. This negates the above <code>--notes</code> option, by
resetting the list of notes refs from which notes are shown.
Options are parsed in the order given on the command line, so e.g.
"--notes --notes=foo --no-notes --notes=bar" will only show notes
@@ -1846,7 +1844,7 @@ being displayed. Examples: "--notes=foo" will show only notes from <dd>
<p>
Check the validity of a signed commit object by passing the signature
- to <tt>gpg --verify</tt> and show the output.
+ to <code>gpg --verify</code> and show the output.
</p>
</dd>
<dt class="hdlist1">
@@ -1925,7 +1923,7 @@ built-in formats:</p></div> </p>
<div class="literalblock">
<div class="content">
-<pre><tt><sha1> <title line></tt></pre>
+<pre><code><sha1> <title line></code></pre>
</div></div>
<div class="paragraph"><p>This is designed to be as compact as possible.</p></div>
</li>
@@ -1935,12 +1933,12 @@ built-in formats:</p></div> </p>
<div class="literalblock">
<div class="content">
-<pre><tt>commit <sha1>
-Author: <author></tt></pre>
+<pre><code>commit <sha1>
+Author: <author></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><title line></tt></pre>
+<pre><code><title line></code></pre>
</div></div>
</li>
<li>
@@ -1949,17 +1947,17 @@ Author: <author></tt></pre> </p>
<div class="literalblock">
<div class="content">
-<pre><tt>commit <sha1>
+<pre><code>commit <sha1>
Author: <author>
-Date: <author date></tt></pre>
+Date: <author date></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><title line></tt></pre>
+<pre><code><title line></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><full commit message></tt></pre>
+<pre><code><full commit message></code></pre>
</div></div>
</li>
<li>
@@ -1968,17 +1966,17 @@ Date: <author date></tt></pre> </p>
<div class="literalblock">
<div class="content">
-<pre><tt>commit <sha1>
+<pre><code>commit <sha1>
Author: <author>
-Commit: <committer></tt></pre>
+Commit: <committer></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><title line></tt></pre>
+<pre><code><title line></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><full commit message></tt></pre>
+<pre><code><full commit message></code></pre>
</div></div>
</li>
<li>
@@ -1987,19 +1985,19 @@ Commit: <committer></tt></pre> </p>
<div class="literalblock">
<div class="content">
-<pre><tt>commit <sha1>
+<pre><code>commit <sha1>
Author: <author>
AuthorDate: <author date>
Commit: <committer>
-CommitDate: <committer date></tt></pre>
+CommitDate: <committer date></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><title line></tt></pre>
+<pre><code><title line></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><full commit message></tt></pre>
+<pre><code><full commit message></code></pre>
</div></div>
</li>
<li>
@@ -2008,14 +2006,14 @@ CommitDate: <committer date></tt></pre> </p>
<div class="literalblock">
<div class="content">
-<pre><tt>From <sha1> <date>
+<pre><code>From <sha1> <date>
From: <author>
Date: <author date>
-Subject: [PATCH] <title line></tt></pre>
+Subject: [PATCH] <title line></code></pre>
</div></div>
<div class="literalblock">
<div class="content">
-<pre><tt><full commit message></tt></pre>
+<pre><code><full commit message></code></pre>
</div></div>
</li>
<li>
@@ -2041,8 +2039,8 @@ instead of <em>\n</em>.</p></div> would show something like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>The author of fe6e0ee was Junio C Hamano, 23 hours ago
-The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</tt></pre>
+<pre><code>The author of fe6e0ee was Junio C Hamano, 23 hours ago
+The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<</code></pre>
</div></div>
<div class="paragraph"><p>The placeholders are:</p></div>
<div class="ulist"><ul>
@@ -2120,7 +2118,12 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff </li>
<li>
<p>
-<em>%ai</em>: author date, ISO 8601 format
+<em>%ai</em>: author date, ISO 8601-like format
+</p>
+</li>
+<li>
+<p>
+<em>%aI</em>: author date, strict ISO 8601 format
</p>
</li>
<li>
@@ -2167,7 +2170,12 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff </li>
<li>
<p>
-<em>%ci</em>: committer date, ISO 8601 format
+<em>%ci</em>: committer date, ISO 8601-like format
+</p>
+</li>
+<li>
+<p>
+<em>%cI</em>: committer date, strict ISO 8601 format
</p>
</li>
<li>
@@ -2228,12 +2236,12 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff </li>
<li>
<p>
-<em>%gD</em>: reflog selector, e.g., <tt>refs/stash@{1}</tt>
+<em>%gD</em>: reflog selector, e.g., <code>refs/stash@{1}</code>
</p>
</li>
<li>
<p>
-<em>%gd</em>: shortened reflog selector, e.g., <tt>stash@{1}</tt>
+<em>%gd</em>: shortened reflog selector, e.g., <code>stash@{1}</code>
</p>
</li>
<li>
@@ -2286,10 +2294,10 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff <li>
<p>
<em>%C(…)</em>: color specification, as described in color.branch.* config option;
- adding <tt>auto,</tt> at the beginning will emit color only when colors are
- enabled for log output (by <tt>color.diff</tt>, <tt>color.ui</tt>, or <tt>--color</tt>, and
- respecting the <tt>auto</tt> settings of the former if we are going to a
- terminal). <tt>auto</tt> alone (i.e. <tt>%C(auto)</tt>) will turn on auto coloring
+ adding <code>auto,</code> at the beginning will emit color only when colors are
+ enabled for log output (by <code>color.diff</code>, <code>color.ui</code>, or <code>--color</code>, and
+ respecting the <code>auto</code> settings of the former if we are going to a
+ terminal). <code>auto</code> alone (i.e. <code>%C(auto)</code>) will turn on auto coloring
on the next placeholders until the color is switched again.
</p>
</li>
@@ -2362,16 +2370,16 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff <div class="title">Note</div>
</td>
<td class="content">Some placeholders may depend on other options given to the
-revision traversal engine. For example, the <tt>%g*</tt> reflog options will
+revision traversal engine. For example, the <code>%g*</code> reflog options will
insert an empty string unless we are traversing reflog entries (e.g., by
-<tt>git log -g</tt>). The <tt>%d</tt> placeholder will use the "short" decoration
-format if <tt>--decorate</tt> was not already provided on the command line.</td>
+<code>git log -g</code>). The <code>%d</code> placeholder will use the "short" decoration
+format if <code>--decorate</code> was not already provided on the command line.</td>
</tr></table>
</div>
-<div class="paragraph"><p>If you add a <tt>+</tt> (plus sign) after <em>%</em> of a placeholder, a line-feed
+<div class="paragraph"><p>If you add a <code>+</code> (plus sign) after <em>%</em> of a placeholder, a line-feed
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.</p></div>
-<div class="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
+<div class="paragraph"><p>If you add a <code>-</code> (minus sign) after <em>%</em> of a placeholder, line-feeds that
immediately precede the expansion are deleted if and only if the
placeholder expands to an empty string.</p></div>
<div class="paragraph"><p>If you add a ` ` (space) after <em>%</em> of a placeholder, a space
@@ -2391,7 +2399,7 @@ terminated with a new line, just as the "oneline" format does. For example:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git log -2 --pretty=format:%h 4da45bef \
+<pre><code>$ git log -2 --pretty=format:%h 4da45bef \
| perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
4da45be
7134973 -- NO NEWLINE
@@ -2399,15 +2407,15 @@ For example:</p></div> $ git log -2 --pretty=tformat:%h 4da45bef \
| perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
4da45be
-7134973</tt></pre>
+7134973</code></pre>
</div></div>
-<div class="paragraph"><p>In addition, any unrecognized string that has a <tt>%</tt> in it is interpreted
-as if it has <tt>tformat:</tt> in front of it. For example, these two are
+<div class="paragraph"><p>In addition, any unrecognized string that has a <code>%</code> in it is interpreted
+as if it has <code>tformat:</code> in front of it. For example, these two are
equivalent:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git log -2 --pretty=tformat:%h 4da45bef
-$ git log -2 --pretty=%h 4da45bef</tt></pre>
+<pre><code>$ git log -2 --pretty=tformat:%h 4da45bef
+$ git log -2 --pretty=%h 4da45bef</code></pre>
</div></div>
</li>
</ul></div>
@@ -2420,30 +2428,30 @@ $ git log -2 --pretty=%h 4da45bef</tt></pre> example some architecture-specific files, you might do:</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>git diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64</tt></pre>
+<pre><code>git diff-tree -r <tree-ish> <tree-ish> arch/ia64 include/asm-ia64</code></pre>
</div></div>
<div class="paragraph"><p>and it will only show you what changed in those two directories.</p></div>
-<div class="paragraph"><p>Or if you are searching for what changed in just <tt>kernel/sched.c</tt>, just do</p></div>
+<div class="paragraph"><p>Or if you are searching for what changed in just <code>kernel/sched.c</code>, just do</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>git diff-tree -r <tree-ish> <tree-ish> kernel/sched.c</tt></pre>
+<pre><code>git diff-tree -r <tree-ish> <tree-ish> kernel/sched.c</code></pre>
</div></div>
<div class="paragraph"><p>and it will ignore all differences to other files.</p></div>
<div class="paragraph"><p>The pattern is always the prefix, and is matched exactly. There are no
wildcards. Even stricter, it has to match a complete path component.
-I.e. "foo" does not pick up <tt>foobar.h</tt>. "foo" does match <tt>foo/bar.h</tt>
+I.e. "foo" does not pick up <code>foobar.h</code>. "foo" does match <code>foo/bar.h</code>
so it can be used to name subdirectories.</p></div>
<div class="paragraph"><p>An example of normal usage is:</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>torvalds@ppc970:~/git> git diff-tree --abbrev 5319e4
-:100664 100664 ac348b... a01513... git-fsck-objects.c</tt></pre>
+<pre><code>torvalds@ppc970:~/git> git diff-tree --abbrev 5319e4
+:100664 100664 ac348b... a01513... git-fsck-objects.c</code></pre>
</div></div>
<div class="paragraph"><p>which tells you that the last commit changed just one file (it’s from
this one:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
+<pre><code>commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8
tree 5319e4d609cdd282069cc4dce33c1db559539b03
parent b4e628ea30d5ab3606119d2ea5caeab141d38df7
author Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 2005
@@ -2452,7 +2460,7 @@ committer Linus Torvalds <torvalds@ppc970.osdl.org> Sat Apr 9 12:02:30 200 Make "git-fsck-objects" print out all the root commits it finds.
Once I do the reference tracking, I'll also make it print out all the
-HEAD commits it finds, which is even more interesting.</tt></pre>
+HEAD commits it finds, which is even more interesting.</code></pre>
</div></div>
<div class="paragraph"><p>in case you care).</p></div>
</div>
@@ -2504,12 +2512,12 @@ line per changed file.</p></div> <div class="paragraph"><p>An output line is formatted this way:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0
+<pre><code>in-place edit :100644 100644 bcd1234... 0123456... M file0
copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
create :000000 100644 0000000... 1234567... A file4
delete :100644 000000 1234567... 0000000... D file5
-unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
+unmerged :000000 000000 0000000... 0000000... U file6</code></pre>
</div></div>
<div class="paragraph"><p>That is, from the left to the right:</p></div>
<div class="olist arabic"><ol class="arabic">
@@ -2641,10 +2649,10 @@ and it is out of sync with the index.</p></div> <div class="paragraph"><p>Example:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
+<pre><code>:100644 100644 5be4a4...... 000000...... M file.c</code></pre>
</div></div>
-<div class="paragraph"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
-in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,
+<div class="paragraph"><p>When <code>-z</code> option is not used, TAB, LF, and backslash characters
+in pathnames are represented as <code>\t</code>, <code>\n</code>, and <code>\\</code>,
respectively.</p></div>
</div>
</div>
@@ -2685,7 +2693,7 @@ single path, only for "dst" <div class="paragraph"><p>Example:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>
+<pre><code>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</code></pre>
</div></div>
<div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
all parents.</p></div>
@@ -2709,12 +2717,12 @@ It is preceded with a "git diff" header that looks like this: </p>
<div class="literalblock">
<div class="content">
-<pre><tt>diff --git a/file1 b/file2</tt></pre>
+<pre><code>diff --git a/file1 b/file2</code></pre>
</div></div>
-<div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
+<div class="paragraph"><p>The <code>a/</code> and <code>b/</code> filenames are the same unless rename/copy is
involved. Especially, even for a creation or a deletion,
-<tt>/dev/null</tt> is <em>not</em> used in place of the <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
-<div class="paragraph"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
+<code>/dev/null</code> is <em>not</em> used in place of the <code>a/</code> or <code>b/</code> filenames.</p></div>
+<div class="paragraph"><p>When rename/copy is involved, <code>file1</code> and <code>file2</code> show the
name of the source file of the rename/copy and the name of
the file that rename/copy produces, respectively.</p></div>
</li>
@@ -2724,7 +2732,7 @@ It is followed by one or more extended header lines: </p>
<div class="literalblock">
<div class="content">
-<pre><tt>old mode <mode>
+<pre><code>old mode <mode>
new mode <mode>
deleted file mode <mode>
new file mode <mode>
@@ -2734,11 +2742,11 @@ rename from <path> rename to <path>
similarity index <number>
dissimilarity index <number>
-index <hash>..<hash> <mode></tt></pre>
+index <hash>..<hash> <mode></code></pre>
</div></div>
<div class="paragraph"><p>File modes are printed as 6-digit octal numbers including the file type
and file permission bits.</p></div>
-<div class="paragraph"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
+<div class="paragraph"><p>Path names in extended headers do not include the <code>a/</code> and <code>b/</code> prefixes.</p></div>
<div class="paragraph"><p>The similarity index is the percentage of unchanged lines, and
the dissimilarity index is the percentage of changed lines. It
is a rounded down integer, followed by a percent sign. The
@@ -2752,26 +2760,26 @@ separate lines indicate the old and the new mode.</p></div> <li>
<p>
TAB, LF, double quote and backslash characters in pathnames
- are represented as <tt>\t</tt>, <tt>\n</tt>, <tt>\"</tt> and <tt>\\</tt>, respectively.
+ are represented as <code>\t</code>, <code>\n</code>, <code>\"</code> and <code>\\</code>, respectively.
If there is need for such substitution then the whole
pathname is put in double quotes.
</p>
</li>
<li>
<p>
-All the <tt>file1</tt> files in the output refer to files before the
- commit, and all the <tt>file2</tt> files refer to files after the commit.
+All the <code>file1</code> files in the output refer to files before the
+ commit, and all the <code>file2</code> files refer to files after the commit.
It is incorrect to apply each change to each file sequentially. For
example, this patch will swap a and b:
</p>
<div class="literalblock">
<div class="content">
-<pre><tt>diff --git a/a b/b
+<pre><code>diff --git a/a b/b
rename from a
rename to b
diff --git a/b b/a
rename from b
-rename to a</tt></pre>
+rename to a</code></pre>
</div></div>
</li>
</ol></div>
@@ -2780,7 +2788,7 @@ rename to a</tt></pre> <div class="sect1">
<h2 id="_combined_diff_format">combined diff format</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> option to
+<div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <code>--cc</code> option to
produce a <em>combined diff</em> when showing a merge. This is the default
format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
<a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m’ option to any
@@ -2789,7 +2797,7 @@ of a merge.</p></div> <div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>diff --combined describe.c
+<pre><code>diff --combined describe.c
index fabadb8,cc95eb0..4866510
--- a/describe.c
+++ b/describe.c
@@ -2815,7 +2823,7 @@ index fabadb8,cc95eb0..4866510 +
if (!initialized) {
initialized = 1;
- for_each_ref(get_name);</tt></pre>
+ for_each_ref(get_name);</code></pre>
</div></div>
<div class="olist arabic"><ol class="arabic">
<li>
@@ -2825,12 +2833,12 @@ It is preceded with a "git diff" header, that looks like </p>
<div class="literalblock">
<div class="content">
-<pre><tt>diff --combined file</tt></pre>
+<pre><code>diff --combined file</code></pre>
</div></div>
<div class="paragraph"><p>or like this (when <em>--cc</em> option is used):</p></div>
<div class="literalblock">
<div class="content">
-<pre><tt>diff --cc file</tt></pre>
+<pre><code>diff --cc file</code></pre>
</div></div>
</li>
<li>
@@ -2840,12 +2848,12 @@ It is followed by one or more extended header lines </p>
<div class="literalblock">
<div class="content">
-<pre><tt>index <hash>,<hash>..<hash>
+<pre><code>index <hash>,<hash>..<hash>
mode <mode>,<mode>..<mode>
new file mode <mode>
-deleted file mode <mode>,<mode></tt></pre>
+deleted file mode <mode>,<mode></code></pre>
</div></div>
-<div class="paragraph"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
+<div class="paragraph"><p>The <code>mode <mode>,<mode>..<mode></code> line appears only if at least one of
the <mode> is different from the rest. Extended headers with
information about detected contents movement (renames and
copying detection) are designed to work with diff of two
@@ -2857,49 +2865,49 @@ It is followed by two-line from-file/to-file header </p>
<div class="literalblock">
<div class="content">
-<pre><tt>--- a/file
-+++ b/file</tt></pre>
+<pre><code>--- a/file
++++ b/file</code></pre>
</div></div>
<div class="paragraph"><p>Similar to two-line header for traditional <em>unified</em> diff
-format, <tt>/dev/null</tt> is used to signal created or deleted
+format, <code>/dev/null</code> is used to signal created or deleted
files.</p></div>
</li>
<li>
<p>
Chunk header format is modified to prevent people from
- accidentally feeding it to <tt>patch -p1</tt>. Combined diff format
+ accidentally feeding it to <code>patch -p1</code>. Combined diff format
was created for review of merge commit changes, and was not
meant for apply. The change is similar to the change in the
extended <em>index</em> header:
</p>
<div class="literalblock">
<div class="content">
-<pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>
+<pre><code>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</code></pre>
</div></div>
-<div class="paragraph"><p>There are (number of parents + 1) <tt>@</tt> characters in the chunk
+<div class="paragraph"><p>There are (number of parents + 1) <code>@</code> characters in the chunk
header for combined diff format.</p></div>
</li>
</ol></div>
<div class="paragraph"><p>Unlike the traditional <em>unified</em> diff format, which shows two
-files A and B with a single column that has <tt>-</tt> (minus — appears in A but removed in B), <tt>+</tt> (plus — missing in A but
-added to B), or <tt>" "</tt> (space — unchanged) prefix, this format
+files A and B with a single column that has <code>-</code> (minus — appears in A but removed in B), <code>+</code> (plus — missing in A but
+added to B), or <code>" "</code> (space — unchanged) prefix, this format
compares two or more files file1, file2,… with one file X, and
shows how X differs from each of fileN. One column for each of
fileN is prepended to the output line to note how X’s line is
different from it.</p></div>
-<div class="paragraph"><p>A <tt>-</tt> character in the column N means that the line appears in
-fileN but it does not appear in the result. A <tt>+</tt> character
+<div class="paragraph"><p>A <code>-</code> character in the column N means that the line appears in
+fileN but it does not appear in the result. A <code>+</code> character
in the column N means that the line appears in the result,
and fileN does not have that line (in other words, the line was
added, from the point of view of that parent).</p></div>
<div class="paragraph"><p>In the above example output, the function signature was changed
-from both files (hence two <tt>-</tt> removals from both file1 and
-file2, plus <tt>++</tt> to mean one line that was added does not appear
+from both files (hence two <code>-</code> removals from both file1 and
+file2, plus <code>++</code> to mean one line that was added does not appear
in either file1 or file2). Also eight other lines are the same
-from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div>
-<div class="paragraph"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
+from file1 but do not appear in file2 (hence prefixed with <code>+</code>).</p></div>
+<div class="paragraph"><p>When shown by <code>git diff-tree -c</code>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
-parents). When shown by <tt>git diff-files -c</tt>, it compares the
+parents). When shown by <code>git diff-files -c</code>, it compares the
two unresolved merge parents with the working tree file
(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
"their version").</p></div>
@@ -2908,25 +2916,25 @@ two unresolved merge parents with the working tree file <div class="sect1">
<h2 id="_other_diff_formats">other diff formats</h2>
<div class="sectionbody">
-<div class="paragraph"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
-copied files. The <tt>--stat</tt> option adds diffstat(1) graph to the
+<div class="paragraph"><p>The <code>--summary</code> option describes newly added, deleted, renamed and
+copied files. The <code>--stat</code> option adds diffstat(1) graph to the
output. These options can be combined with other options, such as
-<tt>-p</tt>, and are meant for human consumption.</p></div>
-<div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
+<code>-p</code>, and are meant for human consumption.</p></div>
+<div class="paragraph"><p>When showing a change that involves a rename or a copy, <code>--stat</code> output
formats the pathnames compactly by combining common prefix and suffix of
-the pathnames. For example, a change that moves <tt>arch/i386/Makefile</tt> to
-<tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p></div>
+the pathnames. For example, a change that moves <code>arch/i386/Makefile</code> to
+<code>arch/x86/Makefile</code> while modifying 4 lines will be shown like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>arch/{i386 => x86}/Makefile | 4 +--</tt></pre>
+<pre><code>arch/{i386 => x86}/Makefile | 4 +--</code></pre>
</div></div>
-<div class="paragraph"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
-for easier machine consumption. An entry in <tt>--numstat</tt> output looks
+<div class="paragraph"><p>The <code>--numstat</code> option gives the diffstat(1) information but is designed
+for easier machine consumption. An entry in <code>--numstat</code> output looks
like this:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>1 2 README
-3 1 arch/{i386 => x86}/Makefile</tt></pre>
+<pre><code>1 2 README
+3 1 arch/{i386 => x86}/Makefile</code></pre>
</div></div>
<div class="paragraph"><p>That is, from left to right:</p></div>
<div class="olist arabic"><ol class="arabic">
@@ -2961,11 +2969,11 @@ a newline. </p>
</li>
</ol></div>
-<div class="paragraph"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
+<div class="paragraph"><p>When <code>-z</code> output option is in effect, the output is formatted this way:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>1 2 README NUL
-3 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</tt></pre>
+<pre><code>1 2 README NUL
+3 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</code></pre>
</div></div>
<div class="paragraph"><p>That is:</p></div>
<div class="olist arabic"><ol class="arabic">
@@ -3015,11 +3023,11 @@ a NUL. </p>
</li>
</ol></div>
-<div class="paragraph"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
+<div class="paragraph"><p>The extra <code>NUL</code> before the preimage path in renamed case is to allow
scripts that read the output to tell if the current record being read is
a single-path record or a rename/copy record without reading ahead.
-After reading added and deleted lines, reading up to <tt>NUL</tt> would yield
-the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></div>
+After reading added and deleted lines, reading up to <code>NUL</code> would yield
+the pathname, but if that is <code>NUL</code>, the record will show two paths.</p></div>
</div>
</div>
<div class="sect1">
|