From: Junio C Hamano <junkio@cox.net>
To: Eric Wong <normalperson@yhbt.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] diff.c: respect diff.renames config option
Date: Fri, 07 Jul 2006 05:29:52 -0700 [thread overview]
Message-ID: <7vwtapy4vz.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7vpsghzmr1.fsf@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Fri, 07 Jul 2006 04:18:42 -0700")
In the same spirit...
From: Junio C Hamano <junkio@cox.net>
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 <junkio@cox.net>
---
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
next prev parent reply other threads:[~2006-07-07 12:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-07 10:10 [PATCH 0/1] I forgot to run format-patch with the -M flag Eric Wong
2006-07-07 10:10 ` [PATCH] diff.c: respect diff.renames config option Eric Wong
2006-07-07 10:10 ` [PATCH] builtin-log: respect diff configuration options Eric Wong
2006-07-07 10:43 ` Junio C Hamano
2006-07-07 10:22 ` [PATCH] diff.c: respect diff.renames config option Junio C Hamano
[not found] ` <20060707110123.GA23400@soma>
2006-07-07 11:18 ` Junio C Hamano
2006-07-07 12:17 ` Junio C Hamano
2006-07-08 1:58 ` [PATCH] Fix several places where diff.renames in config can be problematic Eric Wong
2006-07-08 8:05 ` Junio C Hamano
2006-07-08 8:41 ` Eric Wong
2006-07-08 8:50 ` [PATCH] templates/hooks--update: replace diffstat calls with git diff --stat Eric Wong
2006-07-07 12:29 ` Junio C Hamano [this message]
2006-07-07 12:30 ` [PATCH] update Documentation/diff-options.txt Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vwtapy4vz.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).