kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

diff: accept color.diff.context as a synonym for "plain" 

The term "plain" is a bit ambiguous; let's allow the more
specific "context", but keep "plain" around for
compatibility.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2015-05-27 03:22:19 -04:00 committed by Junio C Hamano
parent fdf96a20ac
commit 74b15bfbf6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/config.txt
View File

@ -870,7 +870,8 @@ command line with the `--color[=<when>]` option.
color.diff.<slot>:: color.diff.<slot>::
Use customized color for diff colorization. `<slot>` specifies Use customized color for diff colorization. `<slot>` specifies
which part of the patch to use the specified color, and is one which part of the patch to use the specified color, and is one
of `plain` (context text), `meta` (metainformation), `frag` of `context` (context text - `plain` is a historical synonym),
`meta` (metainformation), `frag`
(hunk header), 'func' (function in hunk header), `old` (removed lines), (hunk header), 'func' (function in hunk header), `old` (removed lines),
`new` (added lines), `commit` (commit headers), or `whitespace` `new` (added lines), `commit` (commit headers), or `whitespace`
(highlighting whitespace errors). The values of these variables may be (highlighting whitespace errors). The values of these variables may be

2
diff.c
View File

@ -54,7 +54,7 @@ static char diff_colors[][COLOR_MAXLEN] = {


static int parse_diff_color_slot(const char *var) static int parse_diff_color_slot(const char *var)
{ {
if (!strcasecmp(var, "plain")) if (!strcasecmp(var, "context") || !strcasecmp(var, "plain"))
return DIFF_PLAIN; return DIFF_PLAIN;
if (!strcasecmp(var, "meta")) if (!strcasecmp(var, "meta"))
return DIFF_METAINFO; return DIFF_METAINFO;