Autogenerated HTML docs for v2.14.1-248-gf0294f

1 files changed, 8 insertions, 9 deletions

diff --git a/git-diff-index.html b/git-diff-index.html
index 07946b51f..7eb462b75 100644
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -1235,15 +1235,14 @@ override configuration settings.</p></div>
 </dt>

 <dd>

 <p>

-        Highlight whitespace errors on lines specified by &lt;kind&gt;

-        in the color specified by <code>color.diff.whitespace</code>.  &lt;kind&gt;

-        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>.

-        The <code>diff.wsErrorHighlight</code> configuration variable can be

-        used to specify the default behaviour.

+        Highlight whitespace errors in the <code>context</code>, <code>old</code> or <code>new</code>

+        lines of the diff.  Multiple values are separated by comma,

+        <code>none</code> resets previous values, <code>default</code> reset the list to

+        <code>new</code> and <code>all</code> is a shorthand for <code>old,new,context</code>.  When

+        this option is not given, and the configuration variable

+        <code>diff.wsErrorHighlight</code> is not set, only whitespace errors in

+        <code>new</code> lines are highlighted. The whitespace errors are colored

+        whith <code>color.diff.whitespace</code>.

 </p>

 </dd>

 <dt class="hdlist1">