Allow subcommand.color and color.subcommand color configuration

[git/git.git] / builtin-log.c

diff --git a/builtin-log.c b/builtin-log.c
index 7acf5d3..6821a08 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);