summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2018-07-18 12:31:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-19 12:02:54 -0700
commit626c0b5d395196ddabcf9b9a430db385722689d4 (patch)
treeb1412186de6f09e4a20a76ec9b0d3cfa89c65619 /Documentation/config.txt
parentdiff.c: add white space mode to move detection that allows indent changes (diff)
downloadtgif-626c0b5d395196ddabcf9b9a430db385722689d4.tar.xz
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/config.txt')
-rw-r--r--Documentation/config.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2659153cb3..6ca7118b01 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1122,6 +1122,11 @@ diff.colorMoved::
true the default color mode will be used. When set to false,
moved lines are not colored.
+diff.colorMovedWS::
+ When moved lines are colored using e.g. the `diff.colorMoved` setting,
+ this option controls the `<mode>` how spaces are treated
+ for details of valid modes see '--color-moved-ws' in linkgit:git-diff[1].
+
color.diff.<slot>::
Use customized color for diff colorization. `<slot>` specifies
which part of the patch to use the specified color, and is one