From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 May 2015 21:33:59 +0000 (-0700)
Subject: Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3
X-Git-Tag: v2.3.8~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1add9aed85674c2396a2a50cd4cd5548db32ac4f?hp=13ec221d8cb054051cd9d4da236b4f7dc6facbfb

Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3

The default $HOME/.gitconfig file created upon "git config --global"
that edits it had incorrectly spelled user.name and user.email
entries in it.

* oh/fix-config-default-user-name-section:
config: fix settings in default_user_config template
---

diff --git a/builtin/config.c b/builtin/config.c
index 15a7bea936..73dc2f1024 100644
--- 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());