Stefan Beller <[email protected]> writes:
> This is easier for the casual reader.
>
> Signed-off-by: Stefan Beller <[email protected]>
> ---
> Documentation/config.txt | 6 ++++--
> Documentation/diff-options.txt | 7 ++++---
> 2 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 29e0b9fa69..3d89be2d84 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -1052,8 +1052,10 @@ This does not affect linkgit:git-format-patch[1] or the
> command line with the `--color[=<when>]` option.
>
> diff.colorMoved::
> - If set moved lines in a diff are colored differently,
> - for details see '--color-moved' in linkgit:git-diff[1].
> + 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.
Ah, I was ahead of myself on a review on an earlier patch. The
above is OK but it may want to say what happens when set to false.
>
> color.diff.<slot>::
> Use customized color for diff colorization. `<slot>` specifies
> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
> index d2c6a60af2..d4dc46ee2f 100644
> --- a/Documentation/diff-options.txt
> +++ b/Documentation/diff-options.txt
> @@ -252,9 +252,10 @@ plain::
> Similarly 'color.diff.oldMoved' will be used for removed lines
> that are added somewhere else in the diff.
> zebra::
> - Blocks of moved code are detected. The detected blocks are
> - painted using the 'color.diff.{old,new}Moved' alternating with
> - 'color.diff.{old,new}MovedAlternative'.
> + Blocks of moved code are detected greedily. The detected blocks are
> + painted using either the 'color.diff.{old,new}Moved' color or
> + 'color.diff.{old,new}MovedAlternative'. The change between
> + the two colors indicates that a new block was detected.
> dimmed_zebra::
> Similar to 'zebra', but additional dimming of uninteresting parts
> of moved code is performed. The bordering lines of two adjacent
