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
This commit is contained in:
Junio C Hamano 2015-05-11 14:33:59 -07:00
commit 1add9aed85

View File

@ -455,9 +455,9 @@ static char *default_user_config(void)
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
strbuf_addf(&buf, strbuf_addf(&buf,
_("# This is Git's per-user configuration file.\n" _("# This is Git's per-user configuration file.\n"
"[core]\n" "[user]\n"
"# Please adapt and uncomment the following lines:\n" "# Please adapt and uncomment the following lines:\n"
"# user = %s\n" "# name = %s\n"
"# email = %s\n"), "# email = %s\n"),
ident_default_name(), ident_default_name(),
ident_default_email()); ident_default_email());