Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jv/maint-config-set' into maint
author
Junio C Hamano
<gitster@pobox.com>
Wed, 28 Dec 2011 20:03:19 +0000
(12:03 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 28 Dec 2011 20:03:19 +0000
(12:03 -0800)
* jv/maint-config-set:
Fix an incorrect reference to --set-all.
builtin/config.c
patch
|
blob
|
history
raw
(from parent 1:
0d57085
)
diff --git
a/builtin/config.c
b/builtin/config.c
index 0315ad76f881aab9a64084f8d2fdd2019907e4cb..d35c06ae51573eafbddd6309fda3f90ecef35d54 100644
(file)
--- 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) {