diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-05 14:54:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-05 14:54:27 -0700 |
| commit | 66527162008d2792c0000096dd7a41d6d5797df3 (patch) | |
| tree | 6eb0708de90242185ee953963ff17086e507ce8f /builtin/merge.c | |
| parent | Merge branch 'jk/test-fail-prereqs-fix' (diff) | |
| parent | Use OPT_CALLBACK and OPT_CALLBACK_F (diff) | |
| download | tgif-66527162008d2792c0000096dd7a41d6d5797df3.tar.xz | |
Merge branch 'dl/opt-callback-cleanup'
Code cleanup.
* dl/opt-callback-cleanup:
Use OPT_CALLBACK and OPT_CALLBACK_F
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 97066a5632..923e32acf1 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -243,9 +243,9 @@ static int option_parse_n(const struct option *opt, } static struct option builtin_merge_options[] = { - { OPTION_CALLBACK, 'n', NULL, NULL, NULL, + OPT_CALLBACK_F('n', NULL, NULL, NULL, N_("do not show a diffstat at the end of the merge"), - PARSE_OPT_NOARG, option_parse_n }, + PARSE_OPT_NOARG, option_parse_n), OPT_BOOL(0, "stat", &show_diffstat, N_("show a diffstat at the end of the merge")), OPT_BOOL(0, "summary", &show_diffstat, N_("(synonym to --stat)")), |