push: fix capitalisation of the option name autoSetupMerge
PATCH 1/1 push: fix capitalisation of the option name autoSetupMerge
From: Fangyi Zhou <[email protected]>
This was found during l10n process by Jiang Xin.
---
push: Fix capitalisation of the option name autoSetupMerge
This was found during l10n process by Jiang Xin.
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(-)
builtin/push.c +1 -1
@@ -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
Signature · 1 line
gitgitgadget
builtin/push.c static NORETURN void die_push_simple(struct branch *branch, · line 177
Quoted 13 lines · Fangyi Zhou via GitGitGadget
From: Fangyi Zhou <[email protected]>
This was found during l10n process by Jiang Xin.
...builtin/push.c +1
-1@@ -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.