diff options
| author | Fangyi Zhou <me@fangyi.io> | 2022-06-15 17:35:44 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-15 20:45:46 +0200 |
| commit | 1f8496c65f963d2b75ef57dc4f09dbc2f5646bf3 (patch) | |
| tree | 4643ebf603f2e73087517968eb09c90cec2249dd | |
| parent | add -i tests: mark "TODO" depending on GIT_TEST_ADD_I_USE_BUILTIN (diff) | |
| download | git-1f8496c65f963d2b75ef57dc4f09dbc2f5646bf3.tar.xz git-1f8496c65f963d2b75ef57dc4f09dbc2f5646bf3.zip | |
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>
| -rw-r--r-- | builtin/push.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/push.c b/builtin/push.c index 86b44f8aa7..df0d68e599 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" |