* [PATCH] push: fix capitalisation of the option name autoSetupMerge
@ 2022-06-15 15:35 Fangyi Zhou via GitGitGadget
2022-06-15 18:47 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Fangyi Zhou via GitGitGadget @ 2022-06-15 15:35 UTC (permalink / raw)
To: git; +Cc: Fangyi Zhou, Fangyi Zhou
From: Fangyi Zhou <me@fangyi.io>
This was found during l10n process by Jiang Xin.
Reported-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Fangyi Zhou <me@fangyi.io>
---
push: Fix capitalisation of the option name autoSetupMerge
This was found during l10n process by Jiang Xin.
Signed-off-by: Fangyi Zhou me@fangyi.io
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1276%2Ffangyi-zhou%2Fautosetupmerge-capitalisation-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1276/fangyi-zhou/autosetupmerge-capitalisation-v1
Pull-Request: https://github.com/git/git/pull/1276
builtin/push.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/push.c b/builtin/push.c
index 86b44f8aa71..df0d68e5998 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -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"
base-commit: 8168d5e9c23ed44ae3d604f392320d66556453c9
--
gitgitgadget
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] push: fix capitalisation of the option name autoSetupMerge
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
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2022-06-15 18:47 UTC (permalink / raw)
To: Fangyi Zhou via GitGitGadget; +Cc: git, Fangyi Zhou
"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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-15 18:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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).