From: Alex Henrie Date: Wed, 28 Sep 2022 05:58:11 +0000 (-0600) Subject: push: improve grammar of branch.autoSetupMerge advice X-Git-Tag: v2.39.0-rc0~128^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a905f8fa8f9139b4883753a4982aaa833322266;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- 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"