push: improve grammar of branch.autoSetupMerge advice
"upstream branches" is plural but "name" and "local branch" are singular. Make them all singular. And because we're talking about a hypothetical branch that doesn't exist yet, use the future tense. Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alex Henrie committed
Sep 27, 2022 at 23:58 UTC
2a905f8fa8f9139b4883753a4982aaa833322266
1 file changed
+2
-2
builtin/push.c
+2
-2
@@ -169,8 +169,8 @@ static NORETURN void die_push_simple(struct branch *branch,
169
if (git_branch_track != BRANCH_TRACK_SIMPLE)
170
advice_automergesimple_maybe = _("\n"
171
"To avoid automatically configuring "
172
- "upstream branches when their name\n"
173
- "doesn't match the local branch, see option "
172
+ "an upstream branch when its name\n"
173
+ "won't match the local branch, see option "
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"