diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-12-05 14:49:59 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-05 14:49:59 +0900 |
| commit | e74a6e0cb9cce36231cec633c703e887c42d5274 (patch) | |
| tree | 8052baaf95653f55afc87041953cccb6221a0440 | |
| parent | 9d442ce2e21fc02332378c6026b011bb5ced1856 (diff) | |
| parent | 18bf67b7537f8ff0cd772847aa03f9cc319b1346 (diff) | |
| download | git-e74a6e0cb9cce36231cec633c703e887c42d5274.tar.gz | |
Merge branch 'rs/config-unset-opthelp-fix'
The option help text given by "git config unset -h" described
the "--all" option to "replace", not "unset", multiple variables,
which has been corrected.
* rs/config-unset-opthelp-fix:
config: fix short help of unset flags
| -rw-r--r-- | builtin/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/config.c b/builtin/config.c index e58eb6a176..e23aef5054 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -1030,8 +1030,8 @@ static int cmd_config_unset(int argc, const char **argv, const char *prefix, struct option opts[] = { CONFIG_LOCATION_OPTIONS(location_opts), OPT_GROUP(N_("Filter")), - OPT_BIT(0, "all", &flags, N_("replace multi-valued config option with new value"), CONFIG_FLAGS_MULTI_REPLACE), - OPT_STRING(0, "value", &value_pattern, N_("pattern"), N_("show config with values matching the pattern")), + OPT_BIT(0, "all", &flags, N_("unset all multi-valued config options"), CONFIG_FLAGS_MULTI_REPLACE), + OPT_STRING(0, "value", &value_pattern, N_("pattern"), N_("unset multi-valued config options with matching values")), OPT_BIT(0, "fixed-value", &flags, N_("use string equality when comparing values to value pattern"), CONFIG_FLAGS_FIXED_VALUE), OPT_END(), }; |