undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-07-07 05:27:24 -07:00
parent b68ea12e30
commit fef88bb013
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@ -1625,6 +1625,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac)
} }
else if (!strcmp(arg, "--color")) else if (!strcmp(arg, "--color"))
options->color_diff = 1; options->color_diff = 1;
else if (!strcmp(arg, "--no-color"))
options->color_diff = 0;
else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space")) else if (!strcmp(arg, "-w") || !strcmp(arg, "--ignore-all-space"))
options->xdl_opts |= XDF_IGNORE_WHITESPACE; options->xdl_opts |= XDF_IGNORE_WHITESPACE;
else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change")) else if (!strcmp(arg, "-b") || !strcmp(arg, "--ignore-space-change"))