summaryrefslogtreecommitdiff
path: root/builtin/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-28 20:03:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-28 20:03:19 (GMT)
commit9a8e485430492a1377885071c94983c2da547174 (patch)
tree395ae9fbf8e9c1beda400bd420ca8c4d23f740df /builtin/config.c
parent0d5708594310c2603682f16cfcb742c3f11704f4 (diff)
parent67e223edc4013b0b3b1caad336e4a43f6d4c66b8 (diff)
downloadgit-9a8e485430492a1377885071c94983c2da547174.zip
git-9a8e485430492a1377885071c94983c2da547174.tar.gz
git-9a8e485430492a1377885071c94983c2da547174.tar.bz2
Merge branch 'jv/maint-config-set' into maint
* jv/maint-config-set: Fix an incorrect reference to --set-all.
Diffstat (limited to 'builtin/config.c')
-rw-r--r--builtin/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/config.c b/builtin/config.c
index 0315ad7..d35c06a 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) {