diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-15 15:08:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-15 15:08:22 -0700 |
| commit | 706b0b5e8d683b06e99bdfb2349228b360e4cf03 (patch) | |
| tree | 6f1f5a53673bd1d33bd43ae2552df5ed965ffc34 /Documentation/diff-options.txt | |
| parent | 1ba2fc603f4aa564e029843589ca0b36a8aed4fc (diff) | |
| parent | e3f2f5f9cd9238ae106434278d325eada2719842 (diff) | |
| download | git-706b0b5e8d683b06e99bdfb2349228b360e4cf03.tar.gz | |
Merge branch 'es/diff-color-moved-fix'
One of the "diff --color-moved" mode "dimmed_zebra" that was named
in an unusual way has been deprecated and replaced by
"dimmed-zebra".
* es/diff-color-moved-fix:
diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index f394608b42..0378cd574e 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -286,10 +286,11 @@ zebra:: 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:: +dimmed-zebra:: Similar to 'zebra', but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. + `dimmed_zebra` is a deprecated synonym. -- --color-moved-ws=<modes>:: |