Merge branch 'ab/sha1dc'

diff --git a/builtin/grep.c b/builtin/grep.c
index e3ba1d98e3b399941c7c25093f8d5b63327d7d2a..fa351c49f4fd74b3cde1703ef98dba5f0c2c4e8f 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -648,7 +648,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) {