* [PATCH] gitworkflows: fix grammar in 'Merge upwards' rule
@ 2018-06-09 15:19 Kyle Meyer
2018-06-09 20:14 ` Elijah Newren
0 siblings, 1 reply; 2+ messages in thread
From: Kyle Meyer @ 2018-06-09 15:19 UTC (permalink / raw)
To: git; +Cc: Kyle Meyer
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] gitworkflows: fix grammar in 'Merge upwards' rule
2018-06-09 15:19 [PATCH] gitworkflows: fix grammar in 'Merge upwards' rule Kyle Meyer
@ 2018-06-09 20:14 ` Elijah Newren
0 siblings, 0 replies; 2+ messages in thread
From: Elijah Newren @ 2018-06-09 20:14 UTC (permalink / raw)
To: Kyle Meyer; +Cc: Git Mailing List
Hi Kyle,
On Sat, Jun 9, 2018 at 8:19 AM, Kyle Meyer <kyle@kyleam.com> wrote:
> 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.
> =====================================
Thanks for sending in the fix.
Reviewed-by: Elijah Newren <newren@gmail.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-09 20:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-09 15:19 [PATCH] gitworkflows: fix grammar in 'Merge upwards' rule Kyle Meyer
2018-06-09 20:14 ` Elijah Newren
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).