summaryrefslogtreecommitdiffstats
path: root/git-diff-files.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-06 16:17:11 -0800
committerJunio C Hamano <gitster@pobox.com>2012-03-06 16:17:11 -0800
commitaea9e6b364b7c38ed3c87ac94e7dc1e7ba7f9ed6 (patch)
tree2d3feab64e90e242ac9d4cfad66ce8b04c99073b /git-diff-files.html
parenta5a6216a7e57659294099a18eb1b55a213f2b951 (diff)
downloadgit-htmldocs-aea9e6b364b7c38ed3c87ac94e7dc1e7ba7f9ed6.tar.gz
Autogenerated HTML docs for v1.7.9.3-362-g71319
Diffstat (limited to 'git-diff-files.html')
-rw-r--r--git-diff-files.html26
1 files changed, 20 insertions, 6 deletions
diff --git a/git-diff-files.html b/git-diff-files.html
index 177d58fc0..ea503cdd2 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -660,17 +660,31 @@ same as for <em>git diff-index</em> and <em>git diff-tree</em>.</p></div>
</p>
</dd>
<dt class="hdlist1">
+--histogram
+</dt>
+<dd>
+<p>
+ Generate a diff using the "histogram diff" algorithm.
+</p>
+</dd>
+<dt class="hdlist1">
--stat[=&lt;width&gt;[,&lt;name-width&gt;[,&lt;count&gt;]]]
</dt>
<dd>
<p>
- Generate a diffstat. You can override the default
- 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.
+ Generate a diffstat. By default, as much space as necessary
+ 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 overriden by
+ <tt>&lt;width&gt;</tt>. The width of the filename part can be limited by
+ giving another width <tt>&lt;name-width&gt;</tt> after a comma. The width
+ of the graph part can be limited by using
+ <tt>--stat-graph-width=&lt;width&gt;</tt> (affects all commands generating
+ a stat graph) or by setting <tt>diff.statGraphWidth=&lt;width&gt;</tt>
+ (does not affect <tt>git format-patch</tt>).
By giving a third parameter <tt>&lt;count&gt;</tt>, you can limit the
- output to the first <tt>&lt;count&gt;</tt> lines, followed by
- <tt>&#8230;</tt> if there are more.
+ output to the first <tt>&lt;count&gt;</tt> lines, followed by <tt>&#8230;</tt> if
+ there are more.
</p>
<div class="paragraph"><p>These parameters can also be set individually with <tt>--stat-width=&lt;width&gt;</tt>,
<tt>--stat-name-width=&lt;name-width&gt;</tt> and <tt>--stat-count=&lt;count&gt;</tt>.</p></div>