summaryrefslogtreecommitdiffstats
path: root/git-diff-files.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-28 14:05:25 -0800
committerJunio C Hamano <gitster@pobox.com>2019-01-28 14:05:25 -0800
commita90214fb857c988a9e8dff46626dc715918a9330 (patch)
tree756c139e2481e113fa188ed55f6b2c46c153a7a3 /git-diff-files.html
parentace33e4fa1aa5ba14bafe92218bf07dea068791f (diff)
downloadgit-htmldocs-a90214fb857c988a9e8dff46626dc715918a9330.tar.gz
Autogenerated HTML docs for v2.20.1-421-g9403f
Diffstat (limited to 'git-diff-files.html')
-rw-r--r--git-diff-files.html31
1 files changed, 29 insertions, 2 deletions
diff --git a/git-diff-files.html b/git-diff-files.html
index 3c78d0d4f..30b173067 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -1227,11 +1227,20 @@ dimmed-zebra
</div></div>
</dd>
<dt class="hdlist1">
+--no-color-moved
+</dt>
+<dd>
+<p>
+ Turn off move detection. This can be used to override configuration
+ settings. It is the same as <code>--color-moved=no</code>.
+</p>
+</dd>
+<dt class="hdlist1">
--color-moved-ws=&lt;modes&gt;
</dt>
<dd>
<p>
- This configures how white spaces are ignored when performing the
+ This configures how whitespace is ignored when performing the
move detection for <code>--color-moved</code>.
These modes can be given as a comma separated list:
</p>
@@ -1239,6 +1248,14 @@ dimmed-zebra
<div class="content">
<div class="dlist"><dl>
<dt class="hdlist1">
+no
+</dt>
+<dd>
+<p>
+ Do not ignore whitespace when performing move detection.
+</p>
+</dd>
+<dt class="hdlist1">
ignore-space-at-eol
</dt>
<dd>
@@ -1270,7 +1287,7 @@ allow-indentation-change
</dt>
<dd>
<p>
- Initially ignore any white spaces in the move detection, then
+ Initially ignore any whitespace 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.
@@ -1280,6 +1297,16 @@ allow-indentation-change
</div></div>
</dd>
<dt class="hdlist1">
+--no-color-moved-ws
+</dt>
+<dd>
+<p>
+ Do not ignore whitespace when performing move detection. This can be
+ used to override configuration settings. It is the same as
+ <code>--color-moved-ws=no</code>.
+</p>
+</dd>
+<dt class="hdlist1">
--word-diff[=&lt;mode&gt;]
</dt>
<dd>