diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-24 21:58:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-25 21:23:52 (GMT) |
| commit | e3f2f5f9cd9238ae106434278d325eada2719842 (patch) | |
| tree | 8959c32d009a921bcb842d06e7c3ebaeb09f49ef /Documentation/diff-options.txt | |
| parent | a42a58d7b62cc1d6301440e81a83feed9d7c118c (diff) | |
| download | git-e3f2f5f9cd9238ae106434278d325eada2719842.zip git-e3f2f5f9cd9238ae106434278d325eada2719842.tar.gz git-e3f2f5f9cd9238ae106434278d325eada2719842.tar.bz2 | |
diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"
The --color-moved "dimmed_zebra" mode (with an underscore) is an
anachronism. Most options and modes are hyphenated. It is more difficult
to type and somewhat more difficult to read than those which are
hyphenated. Therefore, rename it to "dimmed-zebra", and nominally
deprecate "dimmed_zebra".
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 743af97..cbc05e8 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -274,10 +274,11 @@ zebra:: 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. -- --word-diff[=<mode>]:: |