diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-06 05:20:31 +0000 |
| commit | ba4b9286c25f18c7ebbb809ee5732a7810377ab6 (patch) | |
| tree | 390507328a7564b65dc803683c34235700b97409 /git-diff-files.html | |
| parent | 05bf9c54a827e48b2b576488f5170a3490b5180e (diff) | |
| download | git-htmldocs-ba4b9286c25f18c7ebbb809ee5732a7810377ab6.tar.gz | |
Autogenerated HTML docs for v1.5.6.2-212-g08b5
Diffstat (limited to 'git-diff-files.html')
| -rw-r--r-- | git-diff-files.html | 258 |
1 files changed, 153 insertions, 105 deletions
diff --git a/git-diff-files.html b/git-diff-files.html index 993785da0..fb9ca3474 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -3,7 +3,7 @@ <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 7.0.2" />
+<meta name="generator" content="AsciiDoc 8.2.5" />
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -16,8 +16,13 @@ body { margin: 1em 5% 1em 5%;
}
-a { color: blue; }
-a:visited { color: fuchsia; }
+a {
+ color: blue;
+ text-decoration: underline;
+}
+a:visited {
+ color: fuchsia;
+}
em {
font-style: italic;
@@ -39,13 +44,18 @@ h1, h2, h3, h4, h5, h6 { line-height: 1.3;
}
-h1 {
+h1, h2, h3 {
border-bottom: 2px solid silver;
}
h2 {
- border-bottom: 2px solid silver;
padding-top: 0.5em;
}
+h3 {
+ float: left;
+}
+h3 + * {
+ clear: left;
+}
div.sectionbody {
font-family: serif;
@@ -70,7 +80,7 @@ span#author { color: #527bbd;
font-family: sans-serif;
font-weight: bold;
- font-size: 1.2em;
+ font-size: 1.1em;
}
span#email {
}
@@ -139,6 +149,9 @@ div.sidebarblock > div.content { padding: 0.5em;
}
+div.listingblock {
+ margin-right: 0%;
+}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
@@ -148,9 +161,13 @@ div.listingblock > div.content { div.quoteblock > div.content {
padding-left: 2.0em;
}
-div.quoteblock .attribution {
+
+div.attribution {
text-align: right;
}
+div.verseblock + div.attribution {
+ text-align: left;
+}
div.admonitionblock .icon {
vertical-align: top;
@@ -194,13 +211,12 @@ dd > *:first-child { ul, ol {
list-style-position: outside;
}
-ol.olist2 {
+div.olist2 ol {
list-style-type: lower-alpha;
}
div.tableblock > table {
- border-color: #527bbd;
- border-width: 3px;
+ border: 3px solid #527bbd;
}
thead {
font-family: sans-serif;
@@ -214,6 +230,9 @@ div.hlist { margin-top: 0.8em;
margin-bottom: 0.8em;
}
+div.hlist td {
+ padding-bottom: 5px;
+}
td.hlist1 {
vertical-align: top;
font-style: italic;
@@ -226,7 +245,33 @@ td.hlist2 { @media print {
div#footer-badges { display: none; }
}
-include::./stylesheets/xhtml11-manpage.css[]
+
+div#toctitle {
+ color: #527bbd;
+ font-family: sans-serif;
+ font-size: 1.1em;
+ font-weight: bold;
+ margin-top: 1.0em;
+ margin-bottom: 0.1em;
+}
+
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+div.toclevel2 {
+ margin-left: 2em;
+ font-size: 0.9em;
+}
+div.toclevel3 {
+ margin-left: 4em;
+ font-size: 0.9em;
+}
+div.toclevel4 {
+ margin-left: 6em;
+ font-size: 0.9em;
+}
+include1::./stylesheets/xhtml11-manpage.css[]
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -255,6 +300,9 @@ div.exampleblock-content { border-left: 2px solid silver;
padding-left: 0.5em;
}
+
+/* IE6 sets dynamically generated links as visited. */
+div#toc a:visited { color: blue; }
</style>
<title>git-diff-files(1)</title>
</head>
@@ -272,18 +320,18 @@ git-diff-files(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>…]</p>
+<div class="para"><p><em>git diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>…]</p></div>
</div>
-<h2>DESCRIPTION</h2>
+<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<p>Compares the files in the working tree and the index. When paths
+<div class="para"><p>Compares the files in the working tree and the index. When paths
are specified, compares only those named paths. Otherwise all
entries in the index are compared. The output format is the
-same as for <tt>git-diff-index</tt> and <tt>git-diff-tree</tt>.</p>
+same as for <em>git-diff-index</em> and <em>git-diff-tree</em>.</p></div>
</div>
-<h2>OPTIONS</h2>
+<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<dl>
+<div class="vlist"><dl>
<dt>
-p
</dt>
@@ -755,10 +803,10 @@ same as for <tt>git-diff-index</tt> and <tt>git-diff-tree</tt>.</p> Do not show any source or destination prefix.
</p>
</dd>
-</dl>
-<p>For more detailed explanation on these common options, see also
-<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p>
-<dl>
+</dl></div>
+<div class="para"><p>For more detailed explanation on these common options, see also
+<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>
+<div class="vlist"><dl>
<dt>
-1 -2 -3 or --base --ours --theirs, and -0
</dt>
@@ -768,9 +816,9 @@ same as for <tt>git-diff-index</tt> and <tt>git-diff-tree</tt>.</p> branch" respectively. With these options, diffs for
merged entries are not shown.
</p>
-<p>The default is to diff against our branch (-2) and the
+<div class="para"><p>The default is to diff against our branch (-2) and the
cleanly resolved paths. The option -0 can be given to
-omit diff output for unmerged entries and just show "Unmerged".</p>
+omit diff output for unmerged entries and just show "Unmerged".</p></div>
</dd>
<dt>
-c
@@ -794,15 +842,15 @@ omit diff output for unmerged entries and just show "Unmerged".</p> Remain silent even on nonexistent files
</p>
</dd>
-</dl>
+</dl></div>
</div>
-<h2>Output format</h2>
+<h2 id="_output_format">Output format</h2>
<div class="sectionbody">
-<p>The output format from "git-diff-index", "git-diff-tree",
-"git-diff-files" and "git diff --raw" are very similar.</p>
-<p>These commands all compare two sets of things; what is
-compared differs:</p>
-<dl>
+<div class="para"><p>The 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
+compared differs:</p></div>
+<div class="vlist"><dl>
<dt>
git-diff-index <tree-ish>
</dt>
@@ -835,8 +883,8 @@ git-diff-files [<pattern>…] compares the index and the files on the filesystem.
</p>
</dd>
-</dl>
-<p>An output line is formatted this way:</p>
+</dl></div>
+<div class="para"><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
@@ -846,8 +894,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>
-<p>That is, from the left to the right:</p>
-<ol>
+<div class="para"><p>That is, from the left to the right:</p></div>
+<div class="olist"><ol>
<li>
<p>
a colon.
@@ -923,25 +971,25 @@ path for "dst"; only exists for C or R. an LF or a NUL when <em>-z</em> option is used, to terminate the record.
</p>
</li>
-</ol>
-<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>
-<p>Example:</p>
+</ol></div>
+<div class="para"><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="listingblock">
<div class="content">
<pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>
</div></div>
-<p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters
+<div class="para"><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>
+respectively.</p></div>
</div>
-<h2>diff format for merges</h2>
+<h2 id="_diff_format_for_merges">diff format for merges</h2>
<div class="sectionbody">
-<p>"git-diff-tree", "git-diff-files" and "git-diff --raw"
+<div class="para"><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>
-<ol>
+from the format described above in the following way:</p></div>
+<div class="olist"><ol>
<li>
<p>
there is a colon for each parent
@@ -967,26 +1015,26 @@ no optional "score" number single path, only for "dst"
</p>
</li>
-</ol>
-<p>Example:</p>
+</ol></div>
+<div class="para"><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>
-<p>Note that <em>combined diff</em> lists only files which were modified from
-all parents.</p>
+<div class="para"><p>Note that <em>combined diff</em> lists only files which were modified from
+all parents.</p></div>
</div>
-<h2>Generating patches with -p</h2>
+<h2 id="_generating_patches_with_p">Generating patches with -p</h2>
<div class="sectionbody">
-<p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
+<div class="para"><p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
with a <em>-p</em> option, "git diff" without the <em>--raw</em> option, or
"git log" with the "-p" option, they
do not produce the output described above; instead they produce a
patch file. You can customize the creation of such patches via the
-GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p>
-<p>What the -p option produces is slightly different from the traditional
-diff format.</p>
-<ol>
+GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>
+<div class="para"><p>What the -p option produces is slightly different from the traditional
+diff format.</p></div>
+<div class="olist"><ol>
<li>
<p>
It is preceded with a "git diff" header, that looks like
@@ -996,12 +1044,12 @@ It is preceded with a "git diff" header, that looks like <div class="content">
<pre><tt>diff --git a/file1 b/file2</tt></pre>
</div></div>
-<p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
+<div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
involved. Especially, even for a creation or a deletion,
-<tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p>
-<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 <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
+<div class="para"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
name of the source file of the rename/copy and the name of
-the file that rename/copy produces, respectively.</p>
+the file that rename/copy produces, respectively.</p></div>
</li>
<li>
<p>
@@ -1030,20 +1078,20 @@ TAB, LF, double quote and backslash characters in pathnames pathname is put in double quotes.
</p>
</li>
-</ol>
-<p>The similarity index is the percentage of unchanged lines, and
+</ol></div>
+<div class="para"><p>The similarity index is the percentage of unchanged lines, and
the dissimilarity index is the percentage of changed lines. It
is a rounded down integer, followed by a percent sign. The
similarity index value of 100% is thus reserved for two equal
files, while 100% dissimilarity means that no line from the old
-file made it into the new one.</p>
+file made it into the new one.</p></div>
</div>
-<h2>combined diff format</h2>
+<h2 id="_combined_diff_format">combined diff format</h2>
<div class="sectionbody">
-<p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or
+<div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or
<em>--cc</em> option to produce <em>combined diff</em>. For showing a merge commit
with "git log -p", this is the default format.
-A <em>combined diff</em> format looks like this:</p>
+A <em>combined diff</em> format looks like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>diff --combined describe.c
@@ -1074,7 +1122,7 @@ index fabadb8,cc95eb0..4866510 initialized = 1;
for_each_ref(get_name);</tt></pre>
</div></div>
-<ol>
+<div class="olist"><ol>
<li>
<p>
It is preceded with a "git diff" header, that looks like
@@ -1084,7 +1132,7 @@ It is preceded with a "git diff" header, that looks like <div class="content">
<pre><tt>diff --combined file</tt></pre>
</div></div>
-<p>or like this (when <em>--cc</em> option is used):</p>
+<div class="para"><p>or like this (when <em>--cc</em> option is used):</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>diff --c file</tt></pre>
@@ -1102,11 +1150,11 @@ mode <mode>,<mode>..<mode> new file mode <mode>
deleted file mode <mode>,<mode></tt></pre>
</div></div>
-<p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
+<div class="para"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of
the <mode> is different from the rest. Extended headers with
information about detected contents movement (renames and
copying detection) are designed to work with diff of two
-<tree-ish> and are not used by combined diff format.</p>
+<tree-ish> and are not used by combined diff format.</p></div>
</li>
<li>
<p>
@@ -1117,9 +1165,9 @@ It is followed by two-line from-file/to-file header <pre><tt>--- a/file
+++ b/file</tt></pre>
</div></div>
-<p>Similar to two-line header for traditional <em>unified</em> diff
+<div class="para"><p>Similar to two-line header for traditional <em>unified</em> diff
format, <tt>/dev/null</tt> is used to signal created or deleted
-files.</p>
+files.</p></div>
</li>
<li>
<p>
@@ -1133,59 +1181,59 @@ 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>
-<p>There are (number of parents + 1) <tt>@</tt> characters in the chunk
-header for combined diff format.</p>
+<div class="para"><p>There are (number of parents + 1) <tt>@</tt> characters in the chunk
+header for combined diff format.</p></div>
</li>
-</ol>
-<p>Unlike the traditional <em>unified</em> diff format, which shows two
+</ol></div>
+<div class="para"><p>Unlike the traditional <em>unified</em> diff format, which shows two
files A and B with a single column that has <tt>-</tt> (minus —
appears in A but removed in B), <tt>+</tt> (plus — missing in A but
added to B), or <tt>" "</tt> (space — unchanged) prefix, this format
compares two or more files file1, file2,… with one file X, and
shows how X differs from each of fileN. One column for each of
fileN is prepended to the output line to note how X's line is
-different from it.</p>
-<p>A <tt>-</tt> character in the column N means that the line appears in
+different from it.</p></div>
+<div class="para"><p>A <tt>-</tt> character in the column N means that the line appears in
fileN but it does not appear in the result. A <tt>+</tt> character
in the column N means that the line appears in the last file,
and fileN does not have that line (in other words, the line was
-added, from the point of view of that parent).</p>
-<p>In the above example output, the function signature was changed
+added, from the point of view of that parent).</p></div>
+<div class="para"><p>In the above example output, the function signature was changed
from both files (hence two <tt>-</tt> removals from both file1 and
-file2, plus <tt>++</tt> to mean one line that was added does not appear
+file2, plus <tt><tt>+</tt> to mean one line that was added does not appear
in either file1 nor file2). Also two other lines are the same
-from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p>
-<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 <tt> </tt></tt>).</p></div>
+<div class="para"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
parents). When shown by <tt>git diff-files -c</tt>, it compares the
two unresolved merge parents with the working tree file
(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
-"their version").</p>
+"their version").</p></div>
</div>
-<h2>other diff formats</h2>
+<h2 id="_other_diff_formats">other diff formats</h2>
<div class="sectionbody">
-<p>The <tt>--summary</tt> option describes newly added, deleted, renamed and
+<div class="para"><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>
-<p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output
+<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
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>
+<tt>arch/x86/Makefile</tt> 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>
</div></div>
-<p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed
+<div class="para"><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>
+like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>1 2 README
3 1 arch/{i386 => x86}/Makefile</tt></pre>
</div></div>
-<p>That is, from left to right:</p>
-<ol>
+<div class="para"><p>That is, from left to right:</p></div>
+<div class="olist"><ol>
<li>
<p>
the number of added lines;
@@ -1216,15 +1264,15 @@ pathname (possibly with rename/copy information); a newline.
</p>
</li>
-</ol>
-<p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p>
+</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="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>
-<p>That is:</p>
-<ol>
+<div class="para"><p>That is:</p></div>
+<div class="olist"><ol>
<li>
<p>
the number of added lines;
@@ -1270,28 +1318,28 @@ pathname in postimage (only exists if renamed/copied); a NUL.
</p>
</li>
-</ol>
-<p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow
+</ol></div>
+<div class="para"><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
-the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p>
+the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></div>
</div>
-<h2>Author</h2>
+<h2 id="_author">Author</h2>
<div class="sectionbody">
-<p>Written by Linus Torvalds <torvalds@osdl.org></p>
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>
</div>
-<h2>Documentation</h2>
+<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
+<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>
</div>
-<h2>GIT</h2>
+<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<p>Part of the <a href="git.html">git(1)</a> suite</p>
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 02-Jul-2008 03:01:40 UTC
+Last updated 2008-07-06 05:16:43 UTC
</div>
</div>
</body>
|