Merge branch 'jv/maint-config-set' into maint

* jv/maint-config-set:
  Fix an incorrect reference to --set-all.
This commit is contained in:
Junio C Hamano 2011-12-28 12:03:19 -08:00
commit 9a8e485430

View File

@ -444,7 +444,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
ret = git_config_set(argv[0], value); ret = git_config_set(argv[0], value);
if (ret == CONFIG_NOTHING_SET) if (ret == CONFIG_NOTHING_SET)
error("cannot overwrite multiple values with a single value\n" error("cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --set-all to change %s.", argv[0]); " Use a regexp, --add or --replace-all to change %s.", argv[0]);
return ret; return ret;
} }
else if (actions == ACTION_SET_ALL) { else if (actions == ACTION_SET_ALL) {