Merge branch 'rs/mailmap-himself'

diff --git a/color.c b/color.c
index e8e26818b3b1f2ffce1374e2edf88b40c575c3dd..f672885b71acef4108c8cefc9cf887c220f614d3 100644 (file)
--- a/color.c
+++ b/color.c
@@ -1,7 +1,7 @@
 #include "cache.h"
 #include "color.h"
 
-static int git_use_color_default = 0;
+static int git_use_color_default = GIT_COLOR_AUTO;
 int color_stdout_is_tty = -1;
 
 /*