Log ref changes made by git-merge and git-pull.

diff --git a/builtin-log.c b/builtin-log.c
index dd5a5a2b14abcd225c96338994952c1b4c4dffdf..7e5cab15c106f59417804a25d094c94e78d64063 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -105,6 +105,9 @@ static int git_format_config(const char *var, const char *value)
                strcat(extra_headers, value);
                return 0;
        }
+       if (!strcmp(var, "diff.color")) {
+               return 0;
+       }
        return git_diff_ui_config(var, value);
 }