Merge branch 'sg/complete-decorate-full-not-long'

diff --git a/builtin/config.c b/builtin/config.c
index 89f32088f7abd2b93a46a07e9fe63f2afd7066d4..28f57c8fb96c61151042a670ee70722eb8ead143 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -455,9 +455,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());