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 flagsmain
commit
e74a6e0cb9
|
|
@ -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(),
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue