diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-08 14:53:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-08 14:53:48 -0700 |
| commit | 84ea1e42221ac3bab88dda1a6ee25a11802cfef9 (patch) | |
| tree | 77e2756b2438903b8a9403d7f3468f962341b99f /git-diff-tree.html | |
| parent | bec5da4921ecdf10f30acd425332ad4c40801c8b (diff) | |
| download | git-htmldocs-84ea1e42221ac3bab88dda1a6ee25a11802cfef9.tar.gz | |
Autogenerated HTML docs for v2.8.1-116-g7b0d4
Diffstat (limited to 'git-diff-tree.html')
| -rw-r--r-- | git-diff-tree.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-diff-tree.html b/git-diff-tree.html index 4aabb2f75..daab9f57c 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1206,8 +1206,8 @@ override configuration settings.</p></div> </dt>
<dd>
<p>
- Warn if changes introduce whitespace errors. What are
- considered whitespace errors is controlled by <code>core.whitespace</code>
+ Warn if changes introduce conflict markers or whitespace errors.
+ What are considered whitespace errors is controlled by <code>core.whitespace</code>
configuration. By default, trailing whitespaces (including
lines that solely consist of whitespaces) and a space character
that is immediately followed by a tab character inside the
|