Thirteenth batch for 2.14

diff --git a/builtin/grep.c b/builtin/grep.c
index 3e4b9600e86b661c99f4b936dfa574029ac4fbba..f752f642fffc757979c3727c55ed3bb14d7d524c 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -4,6 +4,7 @@
  * Copyright (c) 2006 Junio C Hamano
  */
 #include "cache.h"
+#include "config.h"
 #include "blob.h"
 #include "tree.h"
 #include "commit.h"
@@ -646,7 +647,7 @@ static int grep_submodule(struct grep_opt *opt, const struct object_id *oid,
                return 0;
        if (!is_submodule_populated_gently(path, NULL)) {
                /*
-                * If searching history, check for the presense of the
+                * If searching history, check for the presence of the
                 * submodule's gitdir before skipping the submodule.
                 */
                if (oid) {