diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2022-09-27 23:58:11 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-28 19:03:10 -0700 |
| commit | 2a905f8fa8f9139b4883753a4982aaa833322266 (patch) | |
| tree | 858153b42e9d370b9a64a3658afd99e483777e53 | |
| parent | a0feb8611d4c0b2b5d954efe4e98207f62223436 (diff) | |
| download | git-2a905f8fa8f9139b4883753a4982aaa833322266.tar.xz | |
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>
| -rw-r--r-- | builtin/push.c | 4 |
1 files 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" |