Autogenerated HTML docs for v2.18.0-547-g1d893

1 files changed, 65 insertions, 2 deletions

diff --git a/git-log.html b/git-log.html
index 53e9f8a61..1e6f3a056 100644
--- a/git-log.html
+++ b/git-log.html
@@ -3266,13 +3266,23 @@ plain
 </p>

 </dd>

 <dt class="hdlist1">

-zebra

+blocks

 </dt>

 <dd>

 <p>

         Blocks of moved text of at least 20 alphanumeric characters

         are detected greedily. The detected blocks are

-        painted using either the <em>color.diff.{old,new}Moved</em> color or

+        painted using either the <em>color.diff.{old,new}Moved</em> color.

+        Adjacent blocks cannot be told apart.

+</p>

+</dd>

+<dt class="hdlist1">

+zebra

+</dt>

+<dd>

+<p>

+        Blocks of moved text are detected as in <em>blocks</em> mode. The blocks

+        are painted using either the <em>color.diff.{old,new}Moved</em> color or

         <em>color.diff.{old,new}MovedAlternative</em>. The change between

         the two colors indicates that a new block was detected.

 </p>

@@ -3291,6 +3301,59 @@ dimmed_zebra
 </div></div>

 </dd>

 <dt class="hdlist1">

+--color-moved-ws=&lt;modes&gt;

+</dt>

+<dd>

+<p>

+        This configures how white spaces are ignored when performing the

+        move detection for <code>--color-moved</code>.

+        These modes can be given as a comma separated list:

+</p>

+<div class="openblock">

+<div class="content">

+<div class="dlist"><dl>

+<dt class="hdlist1">

+ignore-space-at-eol

+</dt>

+<dd>

+<p>

+        Ignore changes in whitespace at EOL.

+</p>

+</dd>

+<dt class="hdlist1">

+ignore-space-change

+</dt>

+<dd>

+<p>

+        Ignore changes in amount of whitespace.  This ignores whitespace

+        at line end, and considers all other sequences of one or

+        more whitespace characters to be equivalent.

+</p>

+</dd>

+<dt class="hdlist1">

+ignore-all-space

+</dt>

+<dd>

+<p>

+        Ignore whitespace when comparing lines. This ignores differences

+        even if one line has whitespace where the other line has none.

+</p>

+</dd>

+<dt class="hdlist1">

+allow-indentation-change

+</dt>

+<dd>

+<p>

+        Initially ignore any white spaces in the move detection, then

+        group the moved code blocks only into a block if the change in

+        whitespace is the same per line. This is incompatible with the

+        other modes.

+</p>

+</dd>

+</dl></div>

+</div></div>

+</dd>

+<dt class="hdlist1">

 --word-diff[=&lt;mode&gt;]

 </dt>

 <dd>