summaryrefslogtreecommitdiffstats
path: root/git-diff.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-10-22 04:12:17 +0000
committerJunio C Hamano <junio@kernel.org>2010-10-22 04:12:17 +0000
commitd2179ef025405832dff42141faed13199886b61c (patch)
treeffbde742771a380129d0223749ed086fbea39271 /git-diff.html
parent7f9fa86e7b663383dc905c5b41bedda5cedf02e6 (diff)
downloadgit-htmldocs-d2179ef025405832dff42141faed13199886b61c.tar.gz
Autogenerated HTML docs for v1.7.3.2-90-gd4c43
Diffstat (limited to 'git-diff.html')
-rw-r--r--git-diff.html16
1 files changed, 8 insertions, 8 deletions
diff --git a/git-diff.html b/git-diff.html
index 62708d09b..84b97ca1f 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -467,12 +467,12 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
</p>
</dd>
<dt>
---stat[=width[,name-width]]
+--stat[=&lt;width&gt;[,&lt;name-width&gt;]]
</dt>
<dd>
<p>
Generate a diffstat. You can override the default
- output width for 80-column terminal by <tt>--stat=width</tt>.
+ output width for 80-column terminal by <tt>--stat=&lt;width&gt;</tt>.
The width of the filename part can be controlled by
giving another width to it separated by a comma.
</p>
@@ -500,19 +500,19 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
</p>
</dd>
<dt>
---dirstat[=limit]
+--dirstat[=&lt;limit&gt;]
</dt>
<dd>
<p>
Output the distribution of relative amount of changes (number of lines added or
removed) for each sub-directory. Directories with changes below
a cut-off percent (3% by default) are not shown. The cut-off percent
- can be set with <tt>--dirstat=limit</tt>. Changes in a child directory is not
+ can be set with <tt>--dirstat=&lt;limit&gt;</tt>. Changes in a child directory are not
counted for the parent directory, unless <tt>--cumulative</tt> is used.
</p>
</dd>
<dt>
---dirstat-by-file[=limit]
+--dirstat-by-file[=&lt;limit&gt;]
</dt>
<dd>
<p>
@@ -781,7 +781,7 @@ another file.</p></div>
</p>
</dd>
<dt>
---diff-filter=[ACDMRTUXB*]
+--diff-filter=[(A|C|D|M|R|T|U|X|B)&#8230;[*]]
</dt>
<dd>
<p>
@@ -790,7 +790,7 @@ another file.</p></div>
type (i.e. regular file, symlink, submodule, &#8230;) changed (<tt>T</tt>),
are Unmerged (<tt>U</tt>), are
Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
- Any combination of the filter characters may be used.
+ Any combination of the filter characters (including none) can be used.
When <tt>*</tt> (All-or-none) is added to the combination, all
paths are selected if there is any file that matches
other criteria in the comparison; if there is no file
@@ -1766,7 +1766,7 @@ Output diff in reverse.
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-10-19 23:50:44 UTC
+Last updated 2010-10-22 04:11:05 UTC
</div>
</div>
</body>