From: "Fangyi Zhou via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Fangyi Zhou <me@fangyi.io>, Fangyi Zhou <me@fangyi.io>
Subject: [PATCH] push: fix capitalisation of the option name autoSetupMerge
Date: Wed, 15 Jun 2022 15:35:44 +0000 [thread overview]
Message-ID: <pull.1276.git.git.1655307345132.gitgitgadget@gmail.com> (raw)
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
next reply other threads:[~2022-06-15 15:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-15 15:35 Fangyi Zhou via GitGitGadget [this message]
2022-06-15 18:47 ` [PATCH] push: fix capitalisation of the option name autoSetupMerge 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
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=pull.1276.git.git.1655307345132.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--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).