Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
spurious .sp in manpages
[gitweb.git]
/
builtin-log.c
diff --git
a/builtin-log.c
b/builtin-log.c
index 7acf5d3b0c3393ee700e084470824bb7fd7cf88a..6821a08442603ba28ee2190a9f602f3d8d0f43f3 100644
(file)
--- a/
builtin-log.c
+++ b/
builtin-log.c
@@
-118,7
+118,7
@@
static int git_format_config(const char *var, const char *value)
strcat(extra_headers, value);
return 0;
}
- if (!strcmp(var, "diff.color")) {
+ if (!strcmp(var, "diff.color")
|| !strcmp(var, "color.diff")
) {
return 0;
}
return git_log_config(var, value);