Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-07-18 22:31:56 +0300
committerJunio C Hamano <gitster@pobox.com>2018-07-19 22:02:54 +0300
commit626c0b5d395196ddabcf9b9a430db385722689d4 (patch)
treeb1412186de6f09e4a20a76ec9b0d3cfa89c65619 /Documentation/diff-options.txt
parentca1f4ae4dfade677647928d28728a0cad125981d (diff)
diff.c: offer config option to control ws handling in move detection
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 143acd9417..8da7fed4e2 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -294,8 +294,11 @@ dimmed_zebra::
--color-moved-ws=<modes>::
This configures how white spaces are ignored when performing the
- move detection for `--color-moved`. These modes can be given
- as a comma separated list:
+ move detection for `--color-moved`.
+ifdef::git-diff[]
+ It can be set by the `diff.colorMovedWS` configuration setting.
+endif::git-diff[]
+ These modes can be given as a comma separated list:
+
--
ignore-space-at-eol::