diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-03-16 17:53:07 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-03-16 17:53:07 -0700 |
commit | 8d1ae40bae1568be25dcc55679f1635b90d53d1b (patch) | |
tree | e915b9e846e6390a2c7107def2cf7cad836474be | |
parent | 6969ac64bf1c7bc43e897d6bfe7d2450d37e9aa9 (diff) | |
parent | 5445124fad4db6c6646edc8b9b0348794fd7e439 (diff) | |
download | git-8d1ae40bae1568be25dcc55679f1635b90d53d1b.tar.gz |
Merge branch 'mf/fix-type-in-config-h'
"git config -h" did not describe the "--type" option correctly.
* mf/fix-type-in-config-h:
config: correct "--type" option in "git config -h" output
-rw-r--r-- | builtin/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/config.c b/builtin/config.c index ebec61868b..e7b88a9c08 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -151,7 +151,7 @@ static struct option builtin_config_options[] = { OPT_BIT(0, "get-color", &actions, N_("find the color configured: slot [default]"), ACTION_GET_COLOR), OPT_BIT(0, "get-colorbool", &actions, N_("find the color setting: slot [stdout-is-tty]"), ACTION_GET_COLORBOOL), OPT_GROUP(N_("Type")), - OPT_CALLBACK('t', "type", &type, "", N_("value is given this type"), option_parse_type), + OPT_CALLBACK('t', "type", &type, N_("type"), N_("value is given this type"), option_parse_type), OPT_CALLBACK_VALUE(0, "bool", &type, N_("value is \"true\" or \"false\""), TYPE_BOOL), OPT_CALLBACK_VALUE(0, "int", &type, N_("value is decimal number"), TYPE_INT), OPT_CALLBACK_VALUE(0, "bool-or-int", &type, N_("value is --bool or --int"), TYPE_BOOL_OR_INT), |