Merge branch 'maint-1.7.6' into maint

[git.git] / builtin / log.c

diff --git a/builtin/log.c b/builtin/log.c
index d760ee0885763e964afd9cdaf09a0986da606804..f5d49305903911eb7aa0fb3f73e0fd950b896228 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -608,7 +608,8 @@ static int git_format_config(const char *var, const char *value, void *cb)
                string_list_append(&extra_cc, value);
                return 0;
        }
-       if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
+       if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") ||
+           !strcmp(var, "color.ui")) {
                return 0;
        }
        if (!strcmp(var, "format.numbered")) {