diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-26 23:14:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-26 23:14:59 -0700 |
| commit | fb1fdf1f6a77bd1efab252589905f85f760611ab (patch) | |
| tree | 6e3a8bf5784f4709a0dbf3b12e1a8f1b5a43dd26 /git-diff-index.html | |
| parent | 7526f0aeb1f0a4fa2a4a6fc213db28d5a1b8d418 (diff) | |
| download | git-htmldocs-fb1fdf1f6a77bd1efab252589905f85f760611ab.tar.gz | |
Autogenerated HTML docs for v2.14.1-459-g238e4
Diffstat (limited to 'git-diff-index.html')
| -rw-r--r-- | git-diff-index.html | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/git-diff-index.html b/git-diff-index.html index 7eb462b75..9a4f9a7e8 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -1118,6 +1118,74 @@ explained for the configuration variable <code>core.quotePath</code> (see </p>
</dd>
<dt class="hdlist1">
+--color-moved[=<mode>]
+</dt>
+<dd>
+<p>
+ Moved lines of code are colored differently.
+ The <mode> defaults to <em>no</em> if the option is not given
+ and to <em>zebra</em> if the option with no mode is given.
+ The mode must be one of:
+</p>
+<div class="openblock">
+<div class="content">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+no
+</dt>
+<dd>
+<p>
+ Moved lines are not highlighted.
+</p>
+</dd>
+<dt class="hdlist1">
+default
+</dt>
+<dd>
+<p>
+ Is a synonym for <code>zebra</code>. This may change to a more sensible mode
+ in the future.
+</p>
+</dd>
+<dt class="hdlist1">
+plain
+</dt>
+<dd>
+<p>
+ Any line that is added in one location and was removed
+ in another location will be colored with <em>color.diff.newMoved</em>.
+ Similarly <em>color.diff.oldMoved</em> will be used for removed lines
+ that are added somewhere else in the diff. This mode picks up any
+ moved line, but it is not very useful in a review to determine
+ if a block of code was moved without permutation.
+</p>
+</dd>
+<dt class="hdlist1">
+zebra
+</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
+ <em>color.diff.{old,new}MovedAlternative</em>. The change between
+ the two colors indicates that a new block was detected.
+</p>
+</dd>
+<dt class="hdlist1">
+dimmed_zebra
+</dt>
+<dd>
+<p>
+ Similar to <em>zebra</em>, but additional dimming of uninteresting parts
+ of moved code is performed. The bordering lines of two adjacent
+ blocks are considered interesting, the rest is uninteresting.
+</p>
+</dd>
+</dl></div>
+</div></div>
+</dd>
+<dt class="hdlist1">
--word-diff[=<mode>]
</dt>
<dd>
|