aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-07 05:27:24 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-07 12:28:54 -0700
commitfef88bb0134dfd47b4bd17e668bbb860588dcb39 (patch)
tree4b246ce308995700a64215b826ed4fb4b4d94acb
parentb68ea12e305043a7feef085b6ba098f42357af9b (diff)
downloadgit-fef88bb0134dfd47b4bd17e668bbb860588dcb39.tar.gz
git-fef88bb0134dfd47b4bd17e668bbb860588dcb39.tar.xz
diff.c: --no-color to defeat diff.color configuration.
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--diff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 4bea3066a..1bf1ed096 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"))