Merge branch 'np/config-path-doc'

diff --git a/builtin/grep.c b/builtin/grep.c
index 19e23946ac4bfe53dd0f590fe26250b1f789778b..2d65f27d01f3da772f7bad21f101fdc0af0102ed 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -275,7 +275,7 @@ static int wait_all(void)
 static int grep_cmd_config(const char *var, const char *value, void *cb)
 {
        int st = grep_config(var, value, cb);
-       if (git_default_config(var, value, cb) < 0)
+       if (git_color_default_config(var, value, cb) < 0)
                st = -1;
 
        if (!strcmp(var, "grep.threads")) {