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

* jv/maint-config-set: Fix an incorrect reference to --set-all.
git-mirror · Dec 28, 2011 · 9a8e485 · 9a8e485
2 parents 0d57085 + 67e223e
commit 9a8e485
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/builtin/config.c b/builtin/config.c
@@ -444,7 +444,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		ret = git_config_set(argv[0], value);
 		if (ret == CONFIG_NOTHING_SET)
 			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;
 	}
 	else if (actions == ACTION_SET_ALL) {