diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-11-06 01:01:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-11-06 01:01:59 +0000 |
| commit | 68cf15a825368c926443c26a6516947fca3c1d39 (patch) | |
| tree | a587c9a51372746ddc3cdb08108bb14fb94a0488 /git-diff-tree.html | |
| parent | 39c7a69d994a13cbd5594bf2f5e65a0f21cc9bb9 (diff) | |
| download | git-htmldocs-68cf15a825368c926443c26a6516947fca3c1d39.tar.gz | |
Autogenerated HTML docs for v1.7.3.2-161-g3089c
Diffstat (limited to 'git-diff-tree.html')
| -rw-r--r-- | git-diff-tree.html | 542 |
1 files changed, 318 insertions, 224 deletions
diff --git a/git-diff-tree.html b/git-diff-tree.html index 1a72f29c0..b1d57d5b5 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -3,7 +3,8 @@ <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" />
+<meta name="generator" content="AsciiDoc 8.4.5" />
+<title>git-diff-tree(1)</title>
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -26,10 +27,12 @@ a:visited { em {
font-style: italic;
+ color: navy;
}
strong {
font-weight: bold;
+ color: #083194;
}
tt {
@@ -71,6 +74,10 @@ p { margin-bottom: 0.5em;
}
+ul, ol, li > p {
+ margin-top: 0;
+}
+
pre {
padding: 0;
margin: 0;
@@ -84,7 +91,7 @@ span#author { }
span#email {
}
-span#revision {
+span#revnumber, span#revdate, span#revremark {
font-family: sans-serif;
}
@@ -104,11 +111,13 @@ div#footer-badges { padding-bottom: 0.5em;
}
-div#preamble,
+div#preamble {
+ margin-top: 1.5em;
+ margin-bottom: 1.5em;
+}
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;
}
@@ -123,6 +132,7 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
text-align: left;
@@ -149,22 +159,33 @@ div.sidebarblock > div.content { 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 {
+div.quoteblock {
padding-left: 2.0em;
+ margin-right: 10%;
}
-
-div.attribution {
+div.quoteblock > div.attribution {
+ padding-top: 0.5em;
text-align: right;
}
+
+div.verseblock {
+ padding-left: 2.0em;
+ margin-right: 10%;
+}
+div.verseblock > div.content {
+ white-space: pre;
+}
+div.verseblock > div.attribution {
+ padding-top: 0.75em;
+ text-align: left;
+}
+/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
text-align: left;
}
@@ -187,13 +208,9 @@ div.exampleblock > div.content { 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; }
+a.image:visited { color: white; }
dl {
margin-top: 0.8em;
@@ -202,18 +219,38 @@ dl { dt {
margin-top: 0.5em;
margin-bottom: 0;
- font-style: italic;
+ font-style: normal;
+ color: navy;
}
dd > *:first-child {
- margin-top: 0;
+ margin-top: 0.1em;
}
ul, ol {
list-style-position: outside;
}
-div.olist2 ol {
+ol.arabic {
+ list-style-type: decimal;
+}
+ol.loweralpha {
list-style-type: lower-alpha;
}
+ol.upperalpha {
+ list-style-type: upper-alpha;
+}
+ol.lowerroman {
+ list-style-type: lower-roman;
+}
+ol.upperroman {
+ list-style-type: upper-roman;
+}
+
+div.compact ul, div.compact ol,
+div.compact p, div.compact p,
+div.compact div, div.compact div {
+ margin-top: 0.1em;
+ margin-bottom: 0.1em;
+}
div.tableblock > table {
border: 3px solid #527bbd;
@@ -225,22 +262,53 @@ thead { tfoot {
font-weight: bold;
}
+td > div.verse {
+ white-space: pre;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
+ border-style: none;
+}
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
+}
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
+}
+
-div.hlist {
+div.hdlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
-div.hlist td {
- padding-bottom: 5px;
+div.hdlist tr {
+ padding-bottom: 15px;
}
-td.hlist1 {
+dt.hdlist1.strong, td.hdlist1.strong {
+ font-weight: bold;
+}
+td.hdlist1 {
vertical-align: top;
- font-style: italic;
+ font-style: normal;
padding-right: 0.8em;
+ color: navy;
}
-td.hlist2 {
+td.hdlist2 {
vertical-align: top;
}
+div.hdlist.compact tr {
+ margin: 0;
+ padding-bottom: 0;
+}
+
+.comment {
+ background: yellow;
+}
@media print {
div#footer-badges { display: none; }
@@ -271,7 +339,24 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-include1::./stylesheets/xhtml11-manpage.css[]
+/* Overrides for manpage documents */
+h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+h2 {
+ border-style: none;
+}
+div.sectionbody {
+ margin-left: 5%;
+}
+
+@media print {
+ div#toc { display: none; }
+}
+
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -280,6 +365,7 @@ div.sidebar-content { padding: 0.5em;
}
div.sidebar-title, div.image-title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
margin-top: 0.0em;
@@ -292,8 +378,17 @@ div.listingblock div.content { padding: 0.5em;
}
-div.quoteblock-content {
- padding-left: 2.0em;
+div.quoteblock-attribution {
+ padding-top: 0.5em;
+ text-align: right;
+}
+
+div.verseblock-content {
+ white-space: pre;
+}
+div.verseblock-attribution {
+ padding-top: 0.75em;
+ text-align: left;
}
div.exampleblock-content {
@@ -304,7 +399,6 @@ div.exampleblock-content { /* IE6 sets dynamically generated links as visited. */
div#toc a:visited { color: blue; }
</style>
-<title>git-diff-tree(1)</title>
</head>
<body>
<div id="header">
@@ -318,30 +412,32 @@ git-diff-tree(1) Manual Page </p>
</div>
</div>
-<h2>SYNOPSIS</h2>
+<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
+<div class="verseblock-content"><em>git diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
[-t] [-r] [-c | --cc] [--root] [<common diff options>]
- <tree-ish> [<tree-ish>] [<path>…]</div></div>
+ <tree-ish> [<tree-ish>] [<path>…]</div>
+<div class="verseblock-attribution">
+</div></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>Compares the content and mode of the blobs found via two tree objects.</p></div>
-<div class="para"><p>If there is only one <tree-ish> given, the commit is compared with its parents
+<div class="paragraph"><p>Compares the content and mode of the blobs found via two tree objects.</p></div>
+<div class="paragraph"><p>If there is only one <tree-ish> given, the commit is compared with its parents
(see --stdin below).</p></div>
-<div class="para"><p>Note that <em>git diff-tree</em> can use the tree encapsulated in a commit object.</p></div>
+<div class="paragraph"><p>Note that <em>git diff-tree</em> can use the tree encapsulated in a commit object.</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
-p
</dt>
-<dt>
+<dt class="hdlist1">
-u
</dt>
-<dt>
+<dt class="hdlist1">
--patch
</dt>
<dd>
@@ -350,10 +446,10 @@ git-diff-tree(1) Manual Page </p>
</dd>
-<dt>
+<dt class="hdlist1">
-U<n>
</dt>
-<dt>
+<dt class="hdlist1">
--unified=<n>
</dt>
<dd>
@@ -363,7 +459,7 @@ git-diff-tree(1) Manual Page Implies <tt>-p</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--raw
</dt>
<dd>
@@ -372,7 +468,7 @@ git-diff-tree(1) Manual Page This is the default.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--patch-with-raw
</dt>
<dd>
@@ -380,7 +476,7 @@ git-diff-tree(1) Manual Page Synonym for <tt>-p --raw</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--patience
</dt>
<dd>
@@ -388,7 +484,7 @@ git-diff-tree(1) Manual Page Generate a diff using the "patience diff" algorithm.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--stat[=<width>[,<name-width>]]
</dt>
<dd>
@@ -399,7 +495,7 @@ git-diff-tree(1) Manual Page giving another width to it separated by a comma.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--numstat
</dt>
<dd>
@@ -411,7 +507,7 @@ git-diff-tree(1) Manual Page <tt>0 0</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--shortstat
</dt>
<dd>
@@ -421,7 +517,7 @@ git-diff-tree(1) Manual Page lines.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--dirstat[=<limit>]
</dt>
<dd>
@@ -433,7 +529,7 @@ git-diff-tree(1) Manual Page counted for the parent directory, unless <tt>--cumulative</tt> is used.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--dirstat-by-file[=<limit>]
</dt>
<dd>
@@ -441,7 +537,7 @@ git-diff-tree(1) Manual Page Same as <tt>--dirstat</tt>, but counts changed files instead of lines.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--summary
</dt>
<dd>
@@ -450,7 +546,7 @@ git-diff-tree(1) Manual Page such as creations, renames and mode changes.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--patch-with-stat
</dt>
<dd>
@@ -458,7 +554,7 @@ git-diff-tree(1) Manual Page Synonym for <tt>-p --stat</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-z
</dt>
<dd>
@@ -466,12 +562,12 @@ git-diff-tree(1) Manual Page When <tt>--raw</tt>, <tt>--numstat</tt>, <tt>--name-only</tt> or <tt>--name-status</tt> has been
given, do not munge pathnames and use NULs as output field terminators.
</p>
-<div class="para"><p>Without this option, each pathname output will have TAB, LF, double quotes,
+<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>,
respectively, and the pathname will be enclosed in double quotes if
any of those replacements occurred.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--name-only
</dt>
<dd>
@@ -479,7 +575,7 @@ any of those replacements occurred.</p></div> Show only names of changed files.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--name-status
</dt>
<dd>
@@ -488,7 +584,7 @@ any of those replacements occurred.</p></div> of the <tt>--diff-filter</tt> option on what the status letters mean.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--submodule[=<format>]
</dt>
<dd>
@@ -500,7 +596,7 @@ any of those replacements occurred.</p></div> option of <a href="git-submodule.html">git-submodule(1)</a> does.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--color[=<when>]
</dt>
<dd>
@@ -509,7 +605,7 @@ any of those replacements occurred.</p></div> The value must be always (the default), never, or auto.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--no-color
</dt>
<dd>
@@ -519,7 +615,7 @@ any of those replacements occurred.</p></div> Same as <tt>--color=never</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--word-diff[=<mode>]
</dt>
<dd>
@@ -529,8 +625,8 @@ any of those replacements occurred.</p></div> <tt>--word-diff-regex</tt> below. The <mode> defaults to <em>plain</em>, and
must be one of:
</p>
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
color
</dt>
<dd>
@@ -538,30 +634,30 @@ color Highlight changed words using only colors. Implies <tt>--color</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
plain
</dt>
<dd>
<p>
- Show words as <tt>[-removed-]</tt> and <tt>{+added+}</tt>. Makes no
+ Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
attempts to escape the delimiters if they appear in the input,
so the output may be ambiguous.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
porcelain
</dt>
<dd>
<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>/<tt> </tt>
+ usual unified diff format, starting with a <tt>+</tt>/<tt>-</tt>/` `
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.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
none
</dt>
<dd>
@@ -570,10 +666,10 @@ none </p>
</dd>
</dl></div>
-<div class="para"><p>Note that despite the name of the first mode, color is used to
+<div class="paragraph"><p>Note that despite the name of the first mode, color is used to
highlight the changed parts in all modes if enabled.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--word-diff-regex=<regex>
</dt>
<dd>
@@ -582,19 +678,19 @@ highlight the changed parts in all modes if enabled.</p></div> runs of non-whitespace to be a word. Also implies
<tt>--word-diff</tt> unless it was already enabled.
</p>
-<div class="para"><p>Every non-overlapping match of the
+<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
expression to make sure that it matches all non-whitespace characters.
A match that contains a newline is silently truncated(!) at the
newline.</p></div>
-<div class="para"><p>The regex can also be set via a diff driver or configuration option, see
+<div class="paragraph"><p>The regex can also be set via a diff driver or configuration option, see
<a href="gitattributes.html">gitattributes(1)</a> or <a href="git-config.html">git-config(1)</a>. Giving it explicitly
overrides any diff driver or configuration setting. Diff drivers
override configuration settings.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--color-words[=<regex>]
</dt>
<dd>
@@ -603,7 +699,7 @@ override configuration settings.</p></div> specified) <tt>--word-diff-regex=<regex></tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--no-renames
</dt>
<dd>
@@ -612,7 +708,7 @@ override configuration settings.</p></div> file gives the default to do so.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--check
</dt>
<dd>
@@ -623,7 +719,7 @@ override configuration settings.</p></div> --exit-code.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--full-index
</dt>
<dd>
@@ -633,7 +729,7 @@ override configuration settings.</p></div> line when generating patch format output.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--binary
</dt>
<dd>
@@ -642,7 +738,7 @@ override configuration settings.</p></div> can be applied with <tt>git-apply</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--abbrev[=<n>]
</dt>
<dd>
@@ -655,10 +751,10 @@ override configuration settings.</p></div> digits can be specified with <tt>--abbrev=<n></tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-B[<n>][/<m>]
</dt>
-<dt>
+<dt class="hdlist1">
--break-rewrites[=[<n>][/<m>]]
</dt>
<dd>
@@ -666,7 +762,7 @@ override configuration settings.</p></div> Break complete rewrite changes into pairs of delete and
create. This serves two purposes:
</p>
-<div class="para"><p>It affects the way a change that amounts to a total rewrite of a file
+<div class="paragraph"><p>It affects the way a change that amounts to a total rewrite of a file
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
@@ -675,18 +771,18 @@ option (defaults to 60%). <tt>-B/70%</tt> 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="para"><p>When used with -M, a totally-rewritten file is also considered as the
+<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
-addition and deletion compared to 20% or more of the file's size are
+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>
</dd>
-<dt>
+<dt class="hdlist1">
-M[<n>]
</dt>
-<dt>
+<dt class="hdlist1">
--detect-renames[=<n>]
</dt>
<dd>
@@ -694,15 +790,15 @@ another file.</p></div> Detect renames.
If <tt>n</tt> is specified, it is a 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, <tt>-M90%</tt> means git should consider a
delete/add pair to be a rename if more than 90% of the file
- hasn't changed.
+ hasn’t changed.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-C[<n>]
</dt>
-<dt>
+<dt class="hdlist1">
--detect-copies[=<n>]
</dt>
<dd>
@@ -711,7 +807,7 @@ another file.</p></div> If <tt>n</tt> is specified, it has the same meaning as for <tt>-M<n></tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--diff-filter=[(A|C|D|M|R|T|U|X|B)…[*]]
</dt>
<dd>
@@ -728,7 +824,7 @@ another file.</p></div> that matches other criteria, nothing is selected.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--find-copies-harder
</dt>
<dd>
@@ -742,7 +838,7 @@ another file.</p></div> <tt>-C</tt> option has the same effect.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-l<num>
</dt>
<dd>
@@ -754,7 +850,7 @@ another file.</p></div> number.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-S<string>
</dt>
<dd>
@@ -765,7 +861,7 @@ another file.</p></div> <a href="gitdiffcore.html">gitdiffcore(7)</a> for more details.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-G<regex>
</dt>
<dd>
@@ -774,7 +870,7 @@ another file.</p></div> the given <regex>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--pickaxe-all
</dt>
<dd>
@@ -784,7 +880,7 @@ another file.</p></div> in <string>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--pickaxe-regex
</dt>
<dd>
@@ -793,7 +889,7 @@ another file.</p></div> regex to match.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-O<orderfile>
</dt>
<dd>
@@ -802,7 +898,7 @@ another file.</p></div> <orderfile>, which has one shell glob pattern per line.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-R
</dt>
<dd>
@@ -811,7 +907,7 @@ another file.</p></div> on-disk file to tree contents.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--relative[=<path>]
</dt>
<dd>
@@ -824,10 +920,10 @@ another file.</p></div> to by giving a <path> as an argument.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-a
</dt>
-<dt>
+<dt class="hdlist1">
--text
</dt>
<dd>
@@ -835,7 +931,7 @@ another file.</p></div> Treat all files as text.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--ignore-space-at-eol
</dt>
<dd>
@@ -843,10 +939,10 @@ another file.</p></div> Ignore changes in whitespace at EOL.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-b
</dt>
-<dt>
+<dt class="hdlist1">
--ignore-space-change
</dt>
<dd>
@@ -856,10 +952,10 @@ another file.</p></div> more whitespace characters to be equivalent.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-w
</dt>
-<dt>
+<dt class="hdlist1">
--ignore-all-space
</dt>
<dd>
@@ -869,7 +965,7 @@ another file.</p></div> line has none.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--inter-hunk-context=<lines>
</dt>
<dd>
@@ -878,7 +974,7 @@ another file.</p></div> of lines, thereby fusing hunks that are close to each other.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--exit-code
</dt>
<dd>
@@ -888,7 +984,7 @@ another file.</p></div> 0 means no differences.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--quiet
</dt>
<dd>
@@ -896,7 +992,7 @@ another file.</p></div> Disable all output of the program. Implies <tt>--exit-code</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--ext-diff
</dt>
<dd>
@@ -906,7 +1002,7 @@ another file.</p></div> to use this option with <a href="git-log.html">git-log(1)</a> and friends.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--no-ext-diff
</dt>
<dd>
@@ -914,7 +1010,7 @@ another file.</p></div> Disallow external diff drivers.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--ignore-submodules[=<when>]
</dt>
<dd>
@@ -932,7 +1028,7 @@ another file.</p></div> the behavior until 1.7.0). Using "all" hides all changes to submodules.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--src-prefix=<prefix>
</dt>
<dd>
@@ -940,7 +1036,7 @@ another file.</p></div> Show the given source prefix instead of "a/".
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--dst-prefix=<prefix>
</dt>
<dd>
@@ -948,7 +1044,7 @@ another file.</p></div> Show the given destination prefix instead of "b/".
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--no-prefix
</dt>
<dd>
@@ -957,10 +1053,10 @@ another file.</p></div> </p>
</dd>
</dl></div>
-<div class="para"><p>For more detailed explanation on these common options, see also
+<div class="paragraph"><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>
+<div class="dlist"><dl>
+<dt class="hdlist1">
<tree-ish>
</dt>
<dd>
@@ -968,7 +1064,7 @@ another file.</p></div> The id of a tree object.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
<path>…
</dt>
<dd>
@@ -980,7 +1076,7 @@ another file.</p></div> features.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-r
</dt>
<dd>
@@ -988,7 +1084,7 @@ another file.</p></div> recurse into sub-trees
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-t
</dt>
<dd>
@@ -996,7 +1092,7 @@ another file.</p></div> show tree entry itself as well as subtrees. Implies -r.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--root
</dt>
<dd>
@@ -1005,7 +1101,7 @@ another file.</p></div> creation event. This is equivalent to a diff against the NULL tree.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--stdin
</dt>
<dd>
@@ -1016,18 +1112,18 @@ another file.</p></div> list of <commit> from its standard input. (Use a single space
as separator.)
</p>
-<div class="para"><p>When two trees are given, it compares the first tree with the second.
+<div class="paragraph"><p>When two trees are given, it compares the first tree with the second.
When a single commit is given, it compares the commit with its
parents. The remaining commits, when given, are used as if they are
parents of the first commit.</p></div>
-<div class="para"><p>When comparing two trees, the ID of both trees (separated by a space
+<div class="paragraph"><p>When comparing two trees, the ID of both trees (separated by a space
and terminated by a newline) is printed before the difference. When
comparing commits, the ID of the first (or only) commit, followed by a
newline, is printed.</p></div>
-<div class="para"><p>The following flags further affect the behavior when comparing
+<div class="paragraph"><p>The following flags further affect the behavior when comparing
commits (but not trees).</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
-m
</dt>
<dd>
@@ -1038,7 +1134,7 @@ commits (but not trees).</p></div> also <em>-c</em>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-s
</dt>
<dd>
@@ -1049,7 +1145,7 @@ commits (but not trees).</p></div> only useful with <em>-v</em> flag.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-v
</dt>
<dd>
@@ -1058,10 +1154,10 @@ commits (but not trees).</p></div> the commit message before the differences.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--pretty[=<format>]
</dt>
-<dt>
+<dt class="hdlist1">
--format=<format>
</dt>
<dd>
@@ -1072,10 +1168,10 @@ commits (but not trees).</p></div> the "PRETTY FORMATS" section for some additional details for each
format. 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
+<div class="paragraph"><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>
+<dt class="hdlist1">
--abbrev-commit
</dt>
<dd>
@@ -1085,10 +1181,10 @@ configuration (see <a href="git-config.html">git-config(1)</a>).</p></div> 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
+<div class="paragraph"><p>This should make "--pretty=oneline" a whole lot more readable for
people using 80-column terminals.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--oneline
</dt>
<dd>
@@ -1097,7 +1193,7 @@ people using 80-column terminals.</p></div> used together.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--encoding[=<encoding>]
</dt>
<dd>
@@ -1109,10 +1205,10 @@ people using 80-column terminals.</p></div> defaults to UTF-8.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--no-notes
</dt>
-<dt>
+<dt class="hdlist1">
--show-notes[=<ref>]
</dt>
<dd>
@@ -1123,10 +1219,10 @@ people using 80-column terminals.</p></div> there is no <tt>--pretty</tt>, <tt>--format</tt> nor <tt>--oneline</tt> option is
given on the command line.
</p>
-<div class="para"><p>With an optional argument, add this ref to the list of notes. The ref
+<div class="paragraph"><p>With an optional argument, add this ref to the list of notes. The ref
is taken to be in <tt>refs/notes/</tt> if it is not qualified.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--[no-]standard-notes
</dt>
<dd>
@@ -1137,7 +1233,7 @@ is taken to be in <tt>refs/notes/</tt> if it is not qualified.</p></div> See <a href="git-config.html">git-config(1)</a>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--no-commit-id
</dt>
<dd>
@@ -1146,7 +1242,7 @@ is taken to be in <tt>refs/notes/</tt> if it is not qualified.</p></div> applicable. This flag suppressed the commit ID output.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-c
</dt>
<dd>
@@ -1161,7 +1257,7 @@ is taken to be in <tt>refs/notes/</tt> if it is not qualified.</p></div> from all parents.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--cc
</dt>
<dd>
@@ -1176,7 +1272,7 @@ is taken to be in <tt>refs/notes/</tt> if it is not qualified.</p></div> "empty diff" case.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--always
</dt>
<dd>
@@ -1189,7 +1285,7 @@ is taken to be in <tt>refs/notes/</tt> if it is not qualified.</p></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
+<div class="paragraph"><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,
@@ -1198,13 +1294,13 @@ 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>There are several built-in formats, and you can define
+<div class="paragraph"><p>There are several built-in formats, and you can define
additional formats by setting a pretty.<name>
config option to either another format name, or a
<em>format:</em> string, as described below (see
<a href="git-config.html">git-config(1)</a>). Here are the details of the
built-in formats:</p></div>
-<div class="ilist"><ul>
+<div class="ulist"><ul>
<li>
<p>
<em>oneline</em>
@@ -1213,7 +1309,7 @@ built-in formats:</p></div> <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>
+<div class="paragraph"><p>This is designed to be as compact as possible.</p></div>
</li>
<li>
<p>
@@ -1308,7 +1404,7 @@ Subject: [PATCH] <title line></tt></pre> <p>
<em>raw</em>
</p>
-<div class="para"><p>The <em>raw</em> format shows the entire commit exactly as
+<div class="paragraph"><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
@@ -1319,20 +1415,19 @@ simplification into account.</p></div> <p>
<em>format:<string></em>
</p>
-<div class="para"><p>The <em>format:<string></em> format allows you to specify which information
+<div class="paragraph"><p>The <em>format:<string></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>
+<div class="paragraph"><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>
+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>
+<div class="paragraph"><p>The placeholders are:</p></div>
+<div class="ulist"><ul>
<li>
<p>
<em>%H</em>: commit hash
@@ -1569,21 +1664,21 @@ insert an empty string unless we are traversing reflog entries (e.g., by format if <tt>--decorate</tt> was not already provided on the command line.</td>
</tr></table>
</div>
-<div class="para"><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 <tt>+</tt> (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="para"><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 <tt>-</tt> (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="para"><p>If you add a <tt> </tt> (space) after <em>%</em> of a placeholder, a space
+<div class="paragraph"><p>If you add a ` ` (space) after <em>%</em> of a placeholder, a space
is inserted immediately before the expansion if and only if the
placeholder expands to a non-empty string.</p></div>
-<div class="ilist"><ul>
+<div class="ulist"><ul>
<li>
<p>
<em>tformat:</em>
</p>
-<div class="para"><p>The <em>tformat:</em> format works exactly like <em>format:</em>, except that it
+<div class="paragraph"><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.
@@ -1602,7 +1697,7 @@ $ git log -2 --pretty=tformat:%h 4da45bef \ 4da45be
7134973</tt></pre>
</div></div>
-<div class="para"><p>In addition, any unrecognized string that has a <tt>%</tt> in it is interpreted
+<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
equivalent:</p></div>
<div class="listingblock">
@@ -1615,30 +1710,30 @@ $ git log -2 --pretty=%h 4da45bef</tt></pre> </div>
<h2 id="_limiting_output">Limiting Output</h2>
<div class="sectionbody">
-<div class="para"><p>If you're only interested in differences in a subset of files, for
+<div class="paragraph"><p>If you’re only interested in differences in a subset of files, for
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>
</div></div>
-<div class="para"><p>and it will only show you what changed in those two directories.</p></div>
-<div class="para"><p>Or if you are searching for what changed in just <tt>kernel/sched.c</tt>, just do</p></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="literalblock">
<div class="content">
<pre><tt>git diff-tree -r <tree-ish> <tree-ish> kernel/sched.c</tt></pre>
</div></div>
-<div class="para"><p>and it will ignore all differences to other files.</p></div>
-<div class="para"><p>The pattern is always the prefix, and is matched exactly. There are no
+<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>
so it can be used to name subdirectories.</p></div>
-<div class="para"><p>An example of normal usage is:</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 5319e4......
*100664->100664 blob ac348b.......->a01513....... git-fsck-objects.c</tt></pre>
</div></div>
-<div class="para"><p>which tells you that the last commit changed just one file (it's from
+<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">
@@ -1653,16 +1748,16 @@ 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>
</div></div>
-<div class="para"><p>in case you care).</p></div>
+<div class="paragraph"><p>in case you care).</p></div>
</div>
<h2 id="_raw_output_format">Raw output format</h2>
<div class="sectionbody">
-<div class="para"><p>The raw output format from "git-diff-index", "git-diff-tree",
+<div class="paragraph"><p>The raw output format from "git-diff-index", "git-diff-tree",
"git-diff-files" and "git diff --raw" are very similar.</p></div>
-<div class="para"><p>These commands all compare two sets of things; what is
+<div class="paragraph"><p>These commands all compare two sets of things; what is
compared differs:</p></div>
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
git-diff-index <tree-ish>
</dt>
<dd>
@@ -1670,7 +1765,7 @@ git-diff-index <tree-ish> compares the <tree-ish> and the files on the filesystem.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
git-diff-index --cached <tree-ish>
</dt>
<dd>
@@ -1678,7 +1773,7 @@ git-diff-index --cached <tree-ish> compares the <tree-ish> and the index.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…]
</dt>
<dd>
@@ -1686,7 +1781,7 @@ git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>… compares the trees named by the two arguments.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
git-diff-files [<pattern>…]
</dt>
<dd>
@@ -1695,10 +1790,10 @@ git-diff-files [<pattern>…] </p>
</dd>
</dl></div>
-<div class="para"><p>The "git-diff-tree" command begins its output by printing the hash of
+<div class="paragraph"><p>The "git-diff-tree" command begins its output by printing the hash of
what is being compared. After that, all the commands print one output
line per changed file.</p></div>
-<div class="para"><p>An output line is formatted this way:</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
@@ -1708,8 +1803,8 @@ create :000000 100644 0000000... 1234567... A file4 delete :100644 000000 1234567... 0000000... D file5
unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>
</div></div>
-<div class="para"><p>That is, from the left to the right:</p></div>
-<div class="olist"><ol>
+<div class="paragraph"><p>That is, from the left to the right:</p></div>
+<div class="olist arabic"><ol class="arabic">
<li>
<p>
a colon.
@@ -1786,8 +1881,8 @@ an LF or a NUL when <em>-z</em> option is used, to terminate the record. </p>
</li>
</ol></div>
-<div class="para"><p>Possible status letters are:</p></div>
-<div class="ilist"><ul>
+<div class="paragraph"><p>Possible status letters are:</p></div>
+<div class="ulist"><ul>
<li>
<p>
A: addition of a file
@@ -1830,27 +1925,27 @@ X: "unknown" change type (most probably a bug, please report it) </p>
</li>
</ul></div>
-<div class="para"><p>Status letters C and R are always followed by a score (denoting the
+<div class="paragraph"><p>Status letters C and R are always followed by a score (denoting the
percentage of similarity between the source and target of the move or
copy), and are the only ones to be so.</p></div>
-<div class="para"><p><sha1> is shown as all 0's if a file is new on the filesystem
+<div class="paragraph"><p><sha1> is shown as all 0’s if a file is new on the filesystem
and it is out of sync with the index.</p></div>
-<div class="para"><p>Example:</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>
</div></div>
-<div class="para"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
+<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>,
respectively.</p></div>
</div>
<h2 id="_diff_format_for_merges">diff format for merges</h2>
<div class="sectionbody">
-<div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff --raw"
+<div class="paragraph"><p>"git-diff-tree", "git-diff-files" and "git-diff --raw"
can take <em>-c</em> or <em>--cc</em> option
to generate diff output also for merge commits. The output differs
from the format described above in the following way:</p></div>
-<div class="olist"><ol>
+<div class="olist arabic"><ol class="arabic">
<li>
<p>
there is a colon for each parent
@@ -1877,25 +1972,25 @@ single path, only for "dst" </p>
</li>
</ol></div>
-<div class="para"><p>Example:</p></div>
+<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>
</div></div>
-<div class="para"><p>Note that <em>combined diff</em> lists only files which were modified from
+<div class="paragraph"><p>Note that <em>combined diff</em> lists only files which were modified from
all parents.</p></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
+<div class="paragraph"><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
+<div class="paragraph"><p>What the -p option produces is slightly different from the traditional
diff format:</p></div>
-<div class="olist"><ol>
+<div class="olist arabic"><ol class="arabic">
<li>
<p>
It is preceded with a "git diff" header that looks like this:
@@ -1904,10 +1999,10 @@ It is preceded with a "git diff" header that looks like this: <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
+<div class="paragraph"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
involved. Especially, even for a creation or a deletion,
-<tt>/dev/null</tt> is _not_ used in place of the <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
+<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
name of the source file of the rename/copy and the name of
the file that rename/copy produces, respectively.</p></div>
</li>
@@ -1929,16 +2024,16 @@ similarity index <number> dissimilarity index <number>
index <hash>..<hash> <mode></tt></pre>
</div></div>
-<div class="para"><p>File modes are printed as 6-digit octal numbers including the file type
+<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="para"><p>Path names in extended headers do not include the <tt>a/</tt> and <tt>b/</tt> prefixes.</p></div>
-<div class="para"><p>The similarity index is the percentage of unchanged lines, and
+<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>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 class="para"><p>The index line includes the SHA-1 checksum before and after the change.
+<div class="paragraph"><p>The index line includes the SHA-1 checksum before and after the change.
The <mode> is included if the file mode does not change; otherwise,
separate lines indicate the old and the new mode.</p></div>
</li>
@@ -1971,7 +2066,7 @@ rename to a</tt></pre> </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
+<div class="paragraph"><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; you can force showing
full diff with the <em>-m</em> option.
@@ -2006,7 +2101,7 @@ index fabadb8,cc95eb0..4866510 initialized = 1;
for_each_ref(get_name);</tt></pre>
</div></div>
-<div class="olist"><ol>
+<div class="olist arabic"><ol class="arabic">
<li>
<p>
It is preceded with a "git diff" header, that looks like
@@ -2016,7 +2111,7 @@ It is preceded with a "git diff" header, that looks like <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="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>
@@ -2034,7 +2129,7 @@ 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
+<div class="paragraph"><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
@@ -2049,7 +2144,7 @@ It is followed by two-line from-file/to-file header <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
+<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
files.</p></div>
</li>
@@ -2065,29 +2160,28 @@ Chunk header format is modified to prevent people from <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
+<div class="paragraph"><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
+<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
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
+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
+<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
in the column N means that the line appears in the result,
and fileN does not have that line (in other words, the line was
added, from the point of view of that parent).</p></div>
-<div class="para"><p>In the above example output, the function signature was changed
+<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
in either file1 nor file2). Also eight other lines are the same
from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div>
-<div class="para"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
+<div class="paragraph"><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
@@ -2096,11 +2190,11 @@ two unresolved merge parents with the working tree file </div>
<h2 id="_other_diff_formats">other diff formats</h2>
<div class="sectionbody">
-<div class="para"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
+<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
output. These options can be combined with other options, such as
<tt>-p</tt>, and are meant for human consumption.</p></div>
-<div class="para"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
+<div class="paragraph"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> 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>
@@ -2108,7 +2202,7 @@ the pathnames. For example, a change that moves <tt>arch/i386/Makefile</tt> to <div class="content">
<pre><tt>arch/{i386 => x86}/Makefile | 4 +--</tt></pre>
</div></div>
-<div class="para"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
+<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
like this:</p></div>
<div class="listingblock">
@@ -2116,8 +2210,8 @@ like this:</p></div> <pre><tt>1 2 README
3 1 arch/{i386 => x86}/Makefile</tt></pre>
</div></div>
-<div class="para"><p>That is, from left to right:</p></div>
-<div class="olist"><ol>
+<div class="paragraph"><p>That is, from left to right:</p></div>
+<div class="olist arabic"><ol class="arabic">
<li>
<p>
the number of added lines;
@@ -2149,14 +2243,14 @@ a newline. </p>
</li>
</ol></div>
-<div class="para"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>
+<div class="paragraph"><p>When <tt>-z</tt> 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>
</div></div>
-<div class="para"><p>That is:</p></div>
-<div class="olist"><ol>
+<div class="paragraph"><p>That is:</p></div>
+<div class="olist arabic"><ol class="arabic">
<li>
<p>
the number of added lines;
@@ -2203,7 +2297,7 @@ a NUL. </p>
</li>
</ol></div>
-<div class="para"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
+<div class="paragraph"><p>The extra <tt>NUL</tt> 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
@@ -2211,19 +2305,19 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></ </div>
<h2 id="_author">Author</h2>
<div class="sectionbody">
-<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>
+<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>></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 class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</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 class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-10-27 06:08:19 UTC
+Last updated 2010-01-21 17:44:19 UTC
</div>
</div>
</body>
|