From: Junio C Hamano Date: Fri, 07 Jul 2006 12:29:52 GMT Subject: Re: [PATCH] diff.c: respect diff.renames config option Message-ID: <7vwtapy4vz.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <7vpsghzmr1.fsf@assigned-by-dhcp.cox.net> In the same spirit... 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 files changed, 2 insertions(+), 0 deletions(-) diff --git a/diff.c b/diff.c index 2534fce..39e608f 100644 --- a/diff.c +++ b/diff.c @@ -1622,6 +1622,8 @@ int diff_opt_parse(struct diff_options * } 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")) -- 1.4.1.gfff4c