push: fix capitalisation of the option name autoSetupMerge
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>
Fangyi Zhou committed
Jun 15, 2022 at 15:35 UTC
1f8496c65f963d2b75ef57dc4f09dbc2f5646bf3
1 file changed
+1
-1
builtin/push.c
+1
-1
@@ -171,7 +171,7 @@ static NORETURN void die_push_simple(struct branch *branch,
171
"To avoid automatically configuring "
172
"upstream branches when their name\n"
173
"doesn't match the local branch, see option "
174
- "'simple' of branch.autosetupmerge\n"
174
+ "'simple' of branch.autoSetupMerge\n"
175
"in 'git help config'.\n");
176
die(_("The upstream branch of your current branch does not match\n"
177
"the name of your current branch. To push to the upstream branch\n"