summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-07-28 23:56:15 +0200
committerJunio C Hamano <junkio@cox.net>2006-08-10 15:28:57 -0700
commitf59a59e22f0005d799fe1d40e0c1f7e5c1f68b76 (patch)
treee0390f65a2bfe3b1d1f3468e2a6cbe302dabea70 /diff.h
parent65cdb5f1658c4911b3f17a2e99332e5397c52240 (diff)
downloadgit-f59a59e22f0005d799fe1d40e0c1f7e5c1f68b76.tar.gz
Add the --color-words option to the diff options family
With this option, the changed words are shown inline. For example, if a file containing "This is foo" is changed to "This is bar", the diff will now show "This is " in plain text, "foo" in red, and "bar" in green. 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 2cced530fa..b007240a5d 100644
--- a/diff.h
+++ b/diff.h
@@ -46,7 +46,8 @@ struct diff_options {
full_index:1,
silent_on_remove:1,
find_copies_harder:1,
- color_diff:1;
+ color_diff:1,
+ color_diff_words:1;
int context;
int break_opt;
int detect_rename;