diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-24 04:06:23 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-25 00:39:13 -0700 |
commit | 801235c5e6bff0ec1c4e41c9d46535ead3b693c1 (patch) | |
tree | 6eca5d83b1e5e438a506ca7ab9ec2886a00331a2 /cache.h | |
parent | 29f4ad867cd15f4029c280c417f4a0866d5229a9 (diff) | |
download | git-801235c5e6bff0ec1c4e41c9d46535ead3b693c1.tar.gz git-801235c5e6bff0ec1c4e41c9d46535ead3b693c1.tar.xz |
diff --color: use $GIT_DIR/config
This lets you use something like this in your $GIT_DIR/config
file.
[diff]
color = auto
[diff.color]
new = blue
old = yellow
frag = reverse
When diff.color is set to "auto", colored diff is enabled when
the standard output is the terminal. Other choices are "always",
and "never". Usual boolean true/false can also be used.
The colormap entries can specify colors for the following slots:
plain - lines that appear in both old and new file (context)
meta - diff --git header and extended git diff headers
frag - @@ -n,m +l,k @@ lines (hunk header)
old - lines deleted from old file
new - lines added to new file
The following color names can be used:
normal, bold, dim, l, blink, reverse, reset,
black, red, green, yellow, blue, magenta, cyan,
white
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -181,7 +181,6 @@ extern int assume_unchanged; extern int prefer_symlink_refs; extern int log_all_ref_updates; extern int warn_ambiguous_refs; -extern int diff_rename_limit_default; extern int shared_repository; extern const char *apply_default_whitespace; |