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

gitster · gitster · commit 9a8e48543049 · 2011-12-28T12:03:19.000-08:00
* jv/maint-config-set:
  Fix an incorrect reference to --set-all.
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) {

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