diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-03 14:51:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 14:51:56 -0700 |
| commit | 36f44a06802960abce7febbf9cc40461e5546ee5 (patch) | |
| tree | d0001f04f2edfb3644c304626908f31d495cb17b /builtin-grep.c | |
| parent | 73bae1dc468734bad3ff7d1b8e93e7ac5f9d3dff (diff) | |
| parent | 47a528ad24185133867ebb5bb7692db2cb8bef39 (diff) | |
| download | git-36f44a06802960abce7febbf9cc40461e5546ee5.tar.gz | |
Merge branch 'ho/dashless' into maint
* ho/dashless:
tests: use "git xyzzy" form (t7200 - t9001)
tests: use "git xyzzy" form (t7000 - t7199)
tests: use "git xyzzy" form (t3600 - t6999)
tests: use "git xyzzy" form (t0000 - t3599)
'git foo' program identifies itself without dash in die() messages
Start conforming code to "git subcmd" style
Diffstat (limited to 'builtin-grep.c')
| -rw-r--r-- | builtin-grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 631129ddfd..f59f95f175 100644 --- 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) { |