From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Dec 2011 20:03:19 +0000 (-0800)
Subject: Merge branch 'jv/maint-config-set' into maint
X-Git-Tag: v1.7.8.2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9a8e485430492a1377885071c94983c2da547174?hp=0d5708594310c2603682f16cfcb742c3f11704f4

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

* jv/maint-config-set:
Fix an incorrect reference to --set-all.
---

diff --git a/builtin/config.c b/builtin/config.c
index 0315ad76f8..d35c06ae51 100644
--- 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) {