From 1f8496c65f963d2b75ef57dc4f09dbc2f5646bf3 Mon Sep 17 00:00:00 2001
From: Fangyi Zhou <me@fangyi.io>
Date: Wed, 15 Jun 2022 15:35:44 +0000
Subject: 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>

diff --git a/builtin/push.c b/builtin/push.c
index 86b44f8..df0d68e 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"
-- 
cgit v0.10.2-6-g49f6