git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Ossi Herrala <oherrala@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Fix settings in default_user_config template
Date: Fri, 17 Apr 2015 10:55:16 -0400	[thread overview]
Message-ID: <20150417145516.GB2421@peff.net> (raw)
In-Reply-To: <1429282210-38538-1-git-send-email-oherrala@gmail.com>

On Fri, Apr 17, 2015 at 05:50:10PM +0300, Ossi Herrala wrote:

> The name (not user) and email setting should be in config section
> "user" and not in "core" as documented in Documentation/config.txt.

<facepalm> Well, those probably weren't helping any new users, then,
were they? :)

> 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"),

Looks obviously correct. Thanks for noticing.

-Peff

  reply	other threads:[~2015-04-17 14:55 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-17 14:50 [PATCH] Fix settings in default_user_config template Ossi Herrala
2015-04-17 14:55 ` Jeff King [this message]
2015-04-17 17:08   ` Ossi Herrala
2015-04-17 17:08     ` Ossi Herrala
2015-04-17 17:33     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150417145516.GB2421@peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=oherrala@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).