diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-10 10:08:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-10 10:08:40 -0700 |
| commit | 2e6c1b59fd6cf3b81905af28c64dd0cd9e89234a (patch) | |
| tree | 65b700b3c9f7351eee03a23d0440b6a372751a2e | |
| parent | 82d5a8483e26976c8b6901712b24c1f1dfc2cc0f (diff) | |
| parent | 2a905f8fa8f9139b4883753a4982aaa833322266 (diff) | |
| download | git-2e6c1b59fd6cf3b81905af28c64dd0cd9e89234a.tar.xz | |
Merge branch 'ah/branch-autosetupmerge-grammofix'
Fix grammar of a message introduced in previous round.
* ah/branch-autosetupmerge-grammofix:
push: improve grammar of branch.autoSetupMerge advice
| -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" |