From: Kyle Meyer <kyle@kyleam.com>
To: git@vger.kernel.org
Cc: Kyle Meyer <kyle@kyleam.com>
Subject: [PATCH] gitworkflows: fix grammar in 'Merge upwards' rule
Date: Sat, 9 Jun 2018 11:19:43 -0400 [thread overview]
Message-ID: <20180609151943.7387-1-kyle@kyleam.com> (raw)
Signed-off-by: Kyle Meyer <kyle@kyleam.com>
---
Documentation/gitworkflows.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
index 926e044d0..ca11c7bda 100644
--- a/Documentation/gitworkflows.txt
+++ b/Documentation/gitworkflows.txt
@@ -107,7 +107,7 @@ the unstable branch into the stable one. Hence the following:
.Merge upwards
[caption="Rule: "]
=====================================
-Always commit your fixes to the oldest supported branch that require
+Always commit your fixes to the oldest supported branch that requires
them. Then (periodically) merge the integration branches upwards into each
other.
=====================================
--
2.11.0
next reply other threads:[~2018-06-09 15:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-09 15:19 Kyle Meyer [this message]
2018-06-09 20:14 ` [PATCH] gitworkflows: fix grammar in 'Merge upwards' rule Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180609151943.7387-1-kyle@kyleam.com \
--to=kyle@kyleam.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).