Merge branch 'jt/lazy-object-fetch-fix'

diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt
index 77caa66c2f768b6e43322c4662f45b4191a163c0..85bca83c304c6d95422482b9bc7b8d983bfdc85e 100644 (file)
--- a/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@ -208,3 +208,15 @@ diff.wsErrorHighlight::
        whitespace errors are colored with `color.diff.whitespace`.
        The command line option `--ws-error-highlight=<kind>`
        overrides this setting.
+
+diff.colorMoved::
+       If set to either a valid `<mode>` or a true value, moved lines
+       in a diff are colored differently, for details of valid modes
+       see '--color-moved' in linkgit:git-diff[1]. If simply set to
+       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].