summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-06-13 18:45:44 +0200
committerJunio C Hamano <junkio@cox.net>2006-06-17 17:08:16 -0700
commitcd112cef999c59a7ca2a96c37b197d303a355924 (patch)
treea992fcbbfa44ac11be583e45c0cad8e7ea658f2a /diff.h
parentae448e3854d8b6e7e37aa88fa3917f5dd97f3210 (diff)
downloadgit-cd112cef999c59a7ca2a96c37b197d303a355924.tar.gz
diff options: add --color
This patch is a slightly adjusted version of Junio's patch: http://www.gelato.unsw.edu.au/archives/git/0604/19354.html However, instead of using a config variable, this patch makes it available as a diff option. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index 4fc597c594..de9de574e7 100644
--- a/diff.h
+++ b/diff.h
@@ -32,7 +32,8 @@ struct diff_options {
full_index:1,
silent_on_remove:1,
find_copies_harder:1,
- summary:1;
+ summary:1,
+ color_diff:1;
int context;
int break_opt;
int detect_rename;