diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-06-11 12:37:48 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-06-11 12:37:48 -0700 |
commit | 8c5d59493937c1482fea3e1c3d494aba0abe1005 (patch) | |
tree | 075f9dcc996ccc620b362aeb22114c802af0af01 /git-diff.html | |
parent | 975f4dba2f3b9bdb50b16dbad38ac610850e9fc2 (diff) | |
download | git-htmldocs-8c5d59493937c1482fea3e1c3d494aba0abe1005.tar.gz |
Autogenerated HTML docs for v2.4.3-413-ga5fe66
Diffstat (limited to 'git-diff.html')
-rw-r--r-- | git-diff.html | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/git-diff.html b/git-diff.html index 3bfb91047..f83c59058 100644 --- a/git-diff.html +++ b/git-diff.html @@ -1324,6 +1324,20 @@ override configuration settings.</p></div> </p>
</dd>
<dt class="hdlist1">
+--ws-error-highlight=<kind>
+</dt>
+<dd>
+<p>
+ Highlight whitespace errors on lines specified by <kind>
+ in the color specified by <code>color.diff.whitespace</code>. <kind>
+ is a comma separated list of <code>old</code>, <code>new</code>, <code>context</code>. When
+ this option is not given, only whitespace errors in <code>new</code>
+ lines are highlighted. E.g. <code>--ws-error-highlight=new,old</code>
+ highlights whitespace errors on both deleted and added lines.
+ <code>all</code> can be used as a short-hand for <code>old,new,context</code>.
+</p>
+</dd>
+<dt class="hdlist1">
--full-index
</dt>
<dd>
|