Merge branch 'sb/submodule-blanket-recursive'

diff --git a/builtin/grep.c b/builtin/grep.c
index 7df9c253eebb3053693769d14efe0551393dfd4d..d188871556d814b1532f7118f1d76741850a370d 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -302,6 +302,9 @@ static int grep_cmd_config(const char *var, const char *value, void *cb)
 #endif
        }
 
+       if (!strcmp(var, "submodule.recurse"))
+               recurse_submodules = git_config_bool(var, value);
+
        return st;
 }