From bbc072f5d884d17a6102fd04ae6d2cfcaa98ad48 Mon Sep 17 00:00:00 2001 From: René Scharfe Date: Sun, 19 Aug 2018 19:34:48 +0200 Subject: 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 Signed-off-by: Junio C Hamano --- builtin/pull.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin/pull.c') diff --git a/builtin/pull.c b/builtin/pull.c index 49cc3beb4c..6eebb240da 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, -- cgit v1.3