diff options
| author | René Scharfe <l.s.r@web.de> | 2018-08-19 17:34:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-21 18:35:54 (GMT) |
| commit | bbc072f5d884d17a6102fd04ae6d2cfcaa98ad48 (patch) | |
| tree | 328de077a906da9b57ec9c59171f4fbb97c59fd1 /builtin/pull.c | |
| parent | 446e63ccf536782263be3659d41b6c603c851bce (diff) | |
| download | git-bbc072f5d884d17a6102fd04ae6d2cfcaa98ad48.zip git-bbc072f5d884d17a6102fd04ae6d2cfcaa98ad48.tar.gz git-bbc072f5d884d17a6102fd04ae6d2cfcaa98ad48.tar.bz2 | |
parseopt: group literal string alternatives in argument help
This formally clarifies that the "--option=" part is the same for all
alternatives.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 49cc3be..6eebb24 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -135,7 +135,7 @@ static struct option pull_options[] = { /* Options passed to git-merge or git-rebase */ OPT_GROUP(N_("Options related to merging")), { OPTION_CALLBACK, 'r', "rebase", &opt_rebase, - "false|true|merges|preserve|interactive", + "(false|true|merges|preserve|interactive)", N_("incorporate changes by rebasing rather than merging"), PARSE_OPT_OPTARG, parse_opt_rebase }, OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL, |