From: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date: Wed, 17 Sep 2025 12:02:29 GMT
Subject: Re: [PATCH v3 0/4] breaking changes: switch default initial branch name to "main"
Message-ID: <145305ac-dbfb-4162-a603-b6b60df2bc5e@app.fastmail.com>
In-Reply-To: <xmqqv7lhigb7.fsf@gitster.g>

On Wed, Sep 17, 2025, at 11:22, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>[snip intro]
>
> --- >8 ---
> Subject: [PATCH 5/4] initial branch: give hints after switching the default name
>
>[snip]
>
> But once the default is renamed to 'main', that no longer is true.
> A narrower audience who are new users that follow an instruction
> that assumes the initial branch name is 'master' would only need to
> learn "here is how to change the branch name to match the tutorial
> you are following in the repository you created for practice", and
> "here is how you keep creating repositories with the first branch
> with a name everybody hates" is unnecessary.
>
> It also needs to be noted thta the advise token to squelch the

s/thta/

Which I only mention because

>[snip]
> diff --git c/refs.c w/refs.c
> index 149a8d1cec..5e5a41ec01 100644
> --- c/refs.c
> +++ w/refs.c
> @@ -641,9 +641,17 @@ static const char default_branch_name_advice[] =
> N_(
>  "\n"
>  "\tgit branch -m <name>\n"
>  );
> +#else
> +static const char default_branch_name_advice[] = N_(
> +"Using '%s' as the name for the initial branch since Git 3.0.\n"
> +"If you expected Git to create 'master', you can rename the just-created\n"
> +"branch can be renamed via this command:\n"
> +"\n"
> +"\tgit branch -m master\n"
> +);

Repetition: “can rename ... can be renamed”