Signed-off-by: Ryan Anderson <ryan@xxxxxxxxxxxxxx> --- builtin-log.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/builtin-log.c b/builtin-log.c index 698b71e..0aeeaa4 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -105,6 +105,9 @@ static int git_format_config(const char strcat(extra_headers, value); return 0; } + if (!strcmp(var, "diff.color")) { + return 0; + } return git_diff_config(var, value); } -- 1.4.1.gc473b-dirty - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html