diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-06 04:00:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-06 04:00:31 (GMT) |
| commit | 67e5a00d0a1e5deb15ebd963e61c396567af1ef0 (patch) | |
| tree | 6395cc48fbf5e9cda33748407236e0622273c906 /builtin | |
| parent | 1156097296e584bd05a9feeb14cb9fcf98093dc8 (diff) | |
| parent | 7e1105244202d01ddf1de990f215418b01281bcf (diff) | |
| download | git-67e5a00d0a1e5deb15ebd963e61c396567af1ef0.zip git-67e5a00d0a1e5deb15ebd963e61c396567af1ef0.tar.gz git-67e5a00d0a1e5deb15ebd963e61c396567af1ef0.tar.bz2 | |
Merge branch 'oh/fix-config-default-user-name-section'
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/config.c b/builtin/config.c index d32c532..bfd3016 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()); |