# [PATCH] gitworkflows: fix grammar in 'Merge upwards' rule 2 messages from 2018-06-09 to 2018-06-09. Participants: Kyle Meyer, Elijah Newren. Thread: https://gitlist.dev/t/48681 ## Kyle Meyer, 2018-06-09 15:19 Subject: [PATCH] gitworkflows: fix grammar in 'Merge upwards' rule Message-ID: <20180609151943.7387-1-kyle@kyleam.com> URL: https://gitlist.dev/e/20180609151943.7387-1-kyle%40kyleam.com ``` Signed-off-by: Kyle Meyer --- 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 ``` ## Elijah Newren, 2018-06-09 20:14 Subject: Re: [PATCH] gitworkflows: fix grammar in 'Merge upwards' rule Message-ID: URL: https://gitlist.dev/e/CABPp-BG_4WRP%3D-m7RfqAdYvOrM5CnByHZ%3DyghPqTdOcL2NGjhQ%40mail.gmail.com In-Reply-To: <20180609151943.7387-1-kyle@kyleam.com> ``` Hi Kyle, On Sat, Jun 9, 2018 at 8:19 AM, Kyle Meyer wrote: > Signed-off-by: Kyle Meyer > --- > 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 ```