Skip to content

Commit 1f8496c

Browse files
fangyi-zhougitster
authored andcommitted
push: fix capitalisation of the option name autoSetupMerge
This was found during l10n process by Jiang Xin. Reported-by: Jiang Xin <[email protected]> Signed-off-by: Fangyi Zhou <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7ccbea5 commit 1f8496c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/push.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static NORETURN void die_push_simple(struct branch *branch,
171171
"To avoid automatically configuring "
172172
"upstream branches when their name\n"
173173
"doesn't match the local branch, see option "
174-
"'simple' of branch.autosetupmerge\n"
174+
"'simple' of branch.autoSetupMerge\n"
175175
"in 'git help config'.\n");
176176
die(_("The upstream branch of your current branch does not match\n"
177177
"the name of your current branch. To push to the upstream branch\n"

0 commit comments

Comments
 (0)