@matheusbsbs / matheus-bagliano / commits / fef88bb013
Fork 0

diff.c: --no-color to defeat diff.color configuration.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Jul 7, 2006 at 05:27 UTC fef88bb0134dfd47b4bd17e668bbb860588dcb39
1 file changed +2
diff.c
+2
@@ -1625,6 +1625,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
1625 }
1626 else if (!strcmp(arg, "--color"))
1627 options->color_diff = 1;
1628 + else if (!strcmp(arg, "--no-color"))
1629 + options->color_diff = 0;
1630 else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
1631 options->xdl_opts |= XDF_IGNORE_WHITESPACE;
1632 else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))