Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maint

[git.git] / builtin-grep.c

diff --git a/builtin-grep.c b/builtin-grep.c
index 3ded1ba9da9166c09fb1b65d315499e24036466d..3a51662a35878ae6b5965c90abb747b5b27c5493 100644 (file)
--- a/builtin-grep.c
+++ b/builtin-grep.c
@@ -774,7 +774,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
                        /* Make sure we do not get outside of paths */
                        for (i = 0; paths[i]; i++)
                                if (strncmp(prefix, paths[i], opt.prefix_length))
-                                       die("git-grep: cannot generate relative filenames containing '..'");
+                                       die("git grep: cannot generate relative filenames containing '..'");
                }
        }
        else if (prefix) {