Merge branch 'bc/object-id'

diff --git a/builtin/grep.c b/builtin/grep.c
index fe7b9fdd93c78c302f5be32e51c59a31a87412fb..d04f4400d9db8ef9f0b0dde0c8be46a11bd0e2f7 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -20,7 +20,7 @@
 #include "pathspec.h"
 
 static char const * const grep_usage[] = {
-       N_("git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"),
+       N_("git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"),
        NULL
 };
 
@@ -738,7 +738,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
                        PARSE_OPT_OPTARG, NULL, (intptr_t)default_pager },
                OPT_BOOL(0, "ext-grep", &external_grep_allowed__ignored,
                         N_("allow calling of grep(1) (ignored by this build)")),
-               { OPTION_CALLBACK, 0, "help-all", &options, NULL, N_("show usage"),
+               { OPTION_CALLBACK, 0, "help-all", NULL, NULL, N_("show usage"),
                  PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, help_callback },
                OPT_END()
        };