summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-05-11 14:39:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-11 14:39:28 -0700
commitc99fec6e35437f9db228c5a37c676faf844b3fa3 (patch)
tree9a6f8c27e0bd06c1029e7dd0c854ccdff9d1f92d /builtin
parentGit 2.4 (diff)
parentGit 2.3.8 (diff)
downloadtgif-c99fec6e35437f9db228c5a37c676faf844b3fa3.tar.xz
Sync with 2.3.8
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/config.c b/builtin/config.c
index d32c5327e5..bfd3016e83 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());