summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-05-27 07:22:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-27 20:54:37 (GMT)
commit74b15bfbf6f7efffa40fda170b3a3cb0218d8651 (patch)
treec16ad79e5098f609e7c61301ca995fdbe3ebdc32 /diff.c
parentfdf96a20acf96a6ac538df8113b2aafd6ed71d50 (diff)
downloadgit-74b15bfbf6f7efffa40fda170b3a3cb0218d8651.zip
git-74b15bfbf6f7efffa40fda170b3a3cb0218d8651.tar.gz
git-74b15bfbf6f7efffa40fda170b3a3cb0218d8651.tar.bz2
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>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index d1bd534..d59bdcc 100644
--- a/diff.c
+++ b/diff.c
@@ -54,7 +54,7 @@ static char diff_colors[][COLOR_MAXLEN] = {
static int parse_diff_color_slot(const char *var)
{
- if (!strcasecmp(var, "plain"))
+ if (!strcasecmp(var, "context") || !strcasecmp(var, "plain"))
return DIFF_PLAIN;
if (!strcasecmp(var, "meta"))
return DIFF_METAINFO;