config: fix settings in default_user_config template
authorOssi Herrala <oherrala@gmail.com>
Fri, 17 Apr 2015 14:50:10 +0000 (17:50 +0300)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Apr 2015 17:32:46 +0000 (10:32 -0700)
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>
builtin/config.c
index 9346894240c77a3120530af9e83c0eb12d3edc2f..05cf6915541600781b2078b3dbf2e620f1d6c5ed 100644 (file)
@@ -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());