{"thread":{"id":"58526","subject":"[PATCH] push: improve grammar of branch.autoSetupMerge advice","startedAt":"2022-09-28T05:58:30Z","lastAt":"2022-09-28T05:58:30Z","messageCount":1,"participants":["Alex Henrie"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"463791","messageId":"20220928055811.777227-1-alexhenrie24@gmail.com","threadId":"58526","inReplyTo":null,"subject":"[PATCH] push: improve grammar of branch.autoSetupMerge advice","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2022-09-28T05:58:11Z","receivedAt":"2022-09-28T05:58:30Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"\"upstream branches\" is plural but \"name\" and \"local branch\" are\nsingular. Make them all singular. And because we're talking about a\nhypothetical branch that doesn't exist yet, use the future tense.\n\nSigned-off-by: Alex Henrie <alexhenrie24@gmail.com>\n---\n builtin/push.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/push.c b/builtin/push.c\nindex df0d68e599..f0329c62a2 100644\n--- a/builtin/push.c\n+++ b/builtin/push.c\n@@ -169,8 +169,8 @@ static NORETURN void die_push_simple(struct branch *branch,\n \tif (git_branch_track != BRANCH_TRACK_SIMPLE)\n \t\tadvice_automergesimple_maybe = _(\"\\n\"\n \t\t\t\t \"To avoid automatically configuring \"\n-\t\t\t\t \"upstream branches when their name\\n\"\n-\t\t\t\t \"doesn't match the local branch, see option \"\n+\t\t\t\t \"an upstream branch when its name\\n\"\n+\t\t\t\t \"won't match the local branch, see option \"\n \t\t\t\t \"'simple' of branch.autoSetupMerge\\n\"\n \t\t\t\t \"in 'git help config'.\\n\");\n \tdie(_(\"The upstream branch of your current branch does not match\\n\"\n-- \n2.37.3\n\n"}]}