diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-04-20 15:28:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-20 15:28:34 -0700 |
| commit | 7ff140202a2f55b6856f658711e2b99d293c1fd9 (patch) | |
| tree | 84e274b0610d71f34403f4898ea1a323a819c44d /builtin | |
| parent | Merge branch 'tb/connect-ipv6-parse-fix' (diff) | |
| parent | grep: correctly initialize help-all option (diff) | |
| download | tgif-7ff140202a2f55b6856f658711e2b99d293c1fd9.tar.xz | |
Merge branch 'ps/grep-help-all-callback-arg'
Code clean-up.
* ps/grep-help-all-callback-arg:
grep: correctly initialize help-all option
Diffstat (limited to 'builtin')
| -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 abc440023f..d04f4400d9 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -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() }; |