diff options
Diffstat (limited to 'git-diff-tree.html')
-rw-r--r-- | git-diff-tree.html | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/git-diff-tree.html b/git-diff-tree.html index 3178ede31..d2f41be8a 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -966,14 +966,15 @@ have to use <code>--diff-algorithm=default</code> option.</p></div> part. Maximum width defaults to terminal width, or 80 columns
if not connected to a terminal, and can be overridden by
<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
- <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.
+ giving another width <code><name-width></code> after a comma or by setting
+ <code>diff.statNameWidth=<width></code>. The width of the graph part can be
+ limited by using <code>--stat-graph-width=<width></code> or by setting
+ <code>diff.statGraphWidth=<width></code>. Using <code>--stat</code> or
+ <code>--stat-graph-width</code> affects all commands generating a stat graph,
+ while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</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 <code>--stat-width=<width></code>,
<code>--stat-name-width=<name-width></code> and <code>--stat-count=<count></code>.</p></div>
@@ -2286,6 +2287,15 @@ being displayed. Examples: "--notes=foo" will show only notes from </p>
</dd>
<dt class="hdlist1">
+--show-notes-by-default
+</dt>
+<dd>
+<p>
+ Show the default notes unless options for displaying specific
+ notes are given.
+</p>
+</dd>
+<dt class="hdlist1">
--show-notes[=<ref>]
</dt>
<dt class="hdlist1">
|