summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssi Herrala <oherrala@gmail.com>2015-04-17 17:50:10 +0300
committerJunio C Hamano <gitster@pobox.com>2015-04-17 10:32:46 -0700
commit7e1105244202d01ddf1de990f215418b01281bcf (patch)
tree9f49d001fb2c7bf03bc3271a44949f8578510ef0
parent9830534e40bd15231357965441d4fe02a6a4810e (diff)
downloadgit-7e1105244202d01ddf1de990f215418b01281bcf.tar.gz
config: fix settings in default_user_config templateoh/fix-config-default-user-name-section
The name (not user) and email setting should be in config section "user" and not in "core" as documented in Documentation/config.txt. Signed-off-by: Ossi Herrala <oherrala@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/config.c b/builtin/config.c
index 9346894240..05cf691554 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -463,9 +463,9 @@ static char *default_user_config(void)
struct strbuf buf = STRBUF_INIT;
strbuf_addf(&buf,
_("# This is Git's per-user configuration file.\n"
- "[core]\n"
+ "[user]\n"
"# Please adapt and uncomment the following lines:\n"
- "# user = %s\n"
+ "# name = %s\n"
"# email = %s\n"),
ident_default_name(),
ident_default_email());