summaryrefslogtreecommitdiffstats
path: root/git-diff-tree.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-02 15:02:46 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-02 15:02:46 -0700
commitb76a68630eaab75c4eb1c41f0fc091811854ff43 (patch)
tree5be60264e80970f60d9c56b410c8828693be8588 /git-diff-tree.html
parent0aadbc37c068365a09926cd895863c4a725b45d6 (diff)
downloadgit-htmldocs-b76a68630eaab75c4eb1c41f0fc091811854ff43.tar.gz
Autogenerated HTML docs for v1.7.10.1-433-g34875
Diffstat (limited to 'git-diff-tree.html')
-rw-r--r--git-diff-tree.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-diff-tree.html b/git-diff-tree.html
index 1664b85e8..e0b66592e 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -685,7 +685,7 @@ git-diff-tree(1) Manual Page
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
+ output to the first <tt>&lt;count&gt;</tt> lines, followed by <tt>...</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>,
@@ -893,7 +893,7 @@ plain
</dt>
<dd>
<p>
- Show words as <tt>[-removed-]</tt> and <tt>{<tt>added</tt>}</tt>. Makes no
+ Show words as <tt>[-removed-]</tt> and <tt>{+added+}</tt>. Makes no
attempts to escape the delimiters if they appear in the input,
so the output may be ambiguous.
</p>
@@ -1377,7 +1377,7 @@ of a delete/create pair.</p></div>
<p>
If provided, the results are limited to a subset of files
matching one of these prefix strings.
- i.e., file matches <tt>/^&lt;pattern1&gt;|&lt;pattern2&gt;|&#8230;/</tt>
+ i.e., file matches <tt>/^&lt;pattern1&gt;|&lt;pattern2&gt;|.../</tt>
Note that this parameter does not provide any wildcard or regexp
features.
</p>
@@ -2018,7 +2018,7 @@ 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="paragraph"><p>If you add a <tt>&#43;</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="paragraph"><p>If you add a <tt>-</tt> (minus sign) after <em>%</em> of a placeholder, line-feeds that
@@ -2536,7 +2536,7 @@ added, from the point of view of that parent).</p></div>
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>&#43;</tt>).</p></div>
+from file1 but do not appear in file2 (hence prefixed with <tt>+</tt>).</p></div>
<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