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 /diff.c | |
| 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 'diff.c')
| -rw-r--r-- | diff.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -275,10 +275,12 @@ static int parse_color_moved(const char *arg) return COLOR_MOVED_ZEBRA; else if (!strcmp(arg, "default")) return COLOR_MOVED_DEFAULT; + else if (!strcmp(arg, "dimmed-zebra")) + return COLOR_MOVED_ZEBRA_DIM; else if (!strcmp(arg, "dimmed_zebra")) return COLOR_MOVED_ZEBRA_DIM; else - return error(_("color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', 'plain'")); + return error(_("color moved setting must be one of 'no', 'default', 'zebra', 'dimmed-zebra', 'plain'")); } int git_diff_ui_config(const char *var, const char *value, void *cb) |