diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-28 00:33:43 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-28 00:33:43 +0300 |
| commit | fc0df933c8fa09603a9e9798085ee07ca1a83f65 (patch) | |
| tree | eb9d2ad782975bd21f6725e0a30add4a374ccadb /builtin/pull.c | |
| parent | 6e96e88ae43e8c78ec0066b0ee87d53987b14098 (diff) | |
| parent | bbc072f5d884d17a6102fd04ae6d2cfcaa98ad48 (diff) | |
Merge branch 'rs/opt-updates'
"git cmd -h" updates.
* rs/opt-updates:
parseopt: group literal string alternatives in argument help
remote: improve argument help for add --mirror
checkout-index: improve argument help for --stage
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 53bc5facfda..681c127a070 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, |