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>

diff --git a/builtin/push.c b/builtin/push.c
index df0d68e599857c74a4edf0a85ecdfb037516c47d..f0329c62a2dc04d0422a8de7bd27f813a19115cf 100644 (file)
--- 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"