undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

push: fix capitalisation of the option name autoSetupMerge

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Fangyi Zhou 2022-06-15 15:35:44 +00:00 committed by Junio C Hamano
parent 7ccbea564e
commit 1f8496c65f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/push.c
View File

@ -171,7 +171,7 @@ static NORETURN void die_push_simple(struct branch *branch,
"To avoid automatically configuring " "To avoid automatically configuring "
"upstream branches when their name\n" "upstream branches when their name\n"
"doesn't match the local branch, see option " "doesn't match the local branch, see option "
"'simple' of branch.autosetupmerge\n" "'simple' of branch.autoSetupMerge\n"
"in 'git help config'.\n"); "in 'git help config'.\n");
die(_("The upstream branch of your current branch does not match\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" "the name of your current branch. To push to the upstream branch\n"