diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:33:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-11 14:33:59 -0700 |
| commit | 1add9aed85674c2396a2a50cd4cd5548db32ac4f (patch) | |
| tree | 03a9fa78b01487fb2ea3949e1197b29394e2f330 | |
| parent | 13ec221d8cb054051cd9d4da236b4f7dc6facbfb (diff) | |
| parent | 7e1105244202d01ddf1de990f215418b01281bcf (diff) | |
| download | git-1add9aed85674c2396a2a50cd4cd5548db32ac4f.tar.gz | |
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
| -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 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()); |