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 86b44f8aa71518c711dd3cd5aee27f5c59c0272b..df0d68e599857c74a4edf0a85ecdfb037516c47d 100644 (file)
--- 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"