# [PATCH] push: improve grammar of branch.autoSetupMerge advice 1 messages from 2022-09-28 to 2022-09-28. Participants: Alex Henrie. Thread: https://gitlist.dev/t/58526 ## Alex Henrie, 2022-09-28 05:58 Subject: [PATCH] push: improve grammar of branch.autoSetupMerge advice Message-ID: <20220928055811.777227-1-alexhenrie24@gmail.com> URL: https://gitlist.dev/e/20220928055811.777227-1-alexhenrie24%40gmail.com ``` "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 --- builtin/push.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index df0d68e599..f0329c62a2 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -169,8 +169,8 @@ static NORETURN void die_push_simple(struct branch *branch, if (git_branch_track != BRANCH_TRACK_SIMPLE) advice_automergesimple_maybe = _("\n" "To avoid automatically configuring " - "upstream branches when their name\n" - "doesn't match the local branch, see option " + "an upstream branch when its name\n" + "won't match the local branch, see option " "'simple' of branch.autoSetupMerge\n" "in 'git help config'.\n"); die(_("The upstream branch of your current branch does not match\n" -- 2.37.3 ```