]> Pileus Git - ~andy/git/commitdiff
grep: fix the error message that mentions --exclude
authorBert Wesarg <bert.wesarg@googlemail.com>
Sat, 15 Oct 2011 18:36:22 +0000 (20:36 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 03:25:21 +0000 (20:25 -0700)
Missing rename from --exclude to --standard-exclude.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-grep.c

index 2da6bc61b66eea3594b3d0321de4a39cc3f49f8f..45a23cfe6434cf1836be05f6205dffac3e26fc86 100644 (file)
@@ -971,7 +971,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
        }
 
        if (0 <= opt_exclude)
-               die("--exclude or --no-exclude cannot be used for tracked contents.");
+               die("--[no-]exclude-standard cannot be used for tracked contents.");
 
        if (!list.nr) {
                int hit;