From: Junio C Hamano <gitster@pobox.com>
To: "Fangyi Zhou via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Fangyi Zhou <me@fangyi.io>
Subject: Re: [PATCH] push: fix capitalisation of the option name autoSetupMerge
Date: Wed, 15 Jun 2022 11:47:57 -0700 [thread overview]
Message-ID: <xmqqtu8lzrtu.fsf@gitster.g> (raw)
In-Reply-To: <pull.1276.git.git.1655307345132.gitgitgadget@gmail.com> (Fangyi Zhou via GitGitGadget's message of "Wed, 15 Jun 2022 15:35:44 +0000")
"Fangyi Zhou via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Fangyi Zhou <me@fangyi.io>
>
> This was found during l10n process by Jiang Xin.
> ...
> @@ -171,7 +171,7 @@ static NORETURN void die_push_simple(struct branch *branch,
> "To avoid automatically configuring "
> "upstream branches when their name\n"
> "doesn't match the local branch, see option "
> - "'simple' of branch.autosetupmerge\n"
> + "'simple' of branch.autoSetupMerge\n"
> "in 'git help config'.\n");
> die(_("The upstream branch of your current branch does not match\n"
> "the name of your current branch. To push to the upstream branch\n"
As this affects translation, I'll fast-track and apply the patch
directly on 'master', as the underlying topic that brought in this
string is a new feature that will never be merged down to
maintenance tracks.
Thanks.
prev parent reply other threads:[~2022-06-15 18:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-15 15:35 [PATCH] push: fix capitalisation of the option name autoSetupMerge Fangyi Zhou via GitGitGadget
2022-06-15 18:47 ` Junio C Hamano [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtu8lzrtu.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=me@fangyi.io \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).