From fef88bb0134dfd47b4bd17e668bbb860588dcb39 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 7 Jul 2006 05:27:24 -0700 Subject: [PATCH] diff.c: --no-color to defeat diff.color configuration. Signed-off-by: Junio C Hamano --- diff.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/diff.c b/diff.c index 4bea3066a8..1bf1ed0967 100644 --- a/diff.c +++ b/diff.c @@ -1625,6 +1625,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) } else if (!strcmp(arg, "--color")) options->color_diff = 1; + else if (!strcmp(arg, "--no-color")) + options->color_diff = 0; else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space")) options->xdl_opts |= XDF_IGNORE_WHITESPACE; else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change")) -- 2.11.4.GIT