diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-06 00:54:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-06 00:54:27 +0300 |
| commit | 66527162008d2792c0000096dd7a41d6d5797df3 (patch) | |
| tree | 6eb0708de90242185ee953963ff17086e507ce8f /builtin/pull.c | |
| parent | e34acbdc43056f2070a44b660c2e89121cf4bd18 (diff) | |
| parent | 203c85339fb51bb8b83aae8f0adde44d6e55e018 (diff) | |
Merge branch 'dl/opt-callback-cleanup'
Code cleanup.
* dl/opt-callback-cleanup:
Use OPT_CALLBACK and OPT_CALLBACK_F
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index f1fa6db74e4..00e5857a8d1 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -118,17 +118,17 @@ static struct option pull_options[] = { OPT_PASSTHRU(0, "progress", &opt_progress, NULL, N_("force progress reporting"), PARSE_OPT_NOARG), - { OPTION_CALLBACK, 0, "recurse-submodules", + OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules, N_("on-demand"), N_("control for recursive fetching of submodules"), - PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules }, + PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules), /* Options passed to git-merge or git-rebase */ OPT_GROUP(N_("Options related to merging")), - { OPTION_CALLBACK, 'r', "rebase", &opt_rebase, + OPT_CALLBACK_F('r', "rebase", &opt_rebase, "(false|true|merges|preserve|interactive)", N_("incorporate changes by rebasing rather than merging"), - PARSE_OPT_OPTARG, parse_opt_rebase }, + PARSE_OPT_OPTARG, parse_opt_rebase), OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL, N_("do not show a diffstat at the end of the merge"), PARSE_OPT_NOARG | PARSE_OPT_NONEG), |