{"thread":{"id":"48681","subject":"[PATCH] gitworkflows: fix grammar in 'Merge upwards' rule","startedAt":"2018-06-09T15:19:54Z","lastAt":"2018-06-09T20:14:33Z","messageCount":2,"participants":["Kyle Meyer","Elijah Newren"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"349802","messageId":"20180609151943.7387-1-kyle@kyleam.com","threadId":"48681","inReplyTo":null,"subject":"[PATCH] gitworkflows: fix grammar in 'Merge upwards' rule","fromName":"Kyle Meyer","fromEmail":"kyle@kyleam.com","sentAt":"2018-06-09T15:19:43Z","receivedAt":"2018-06-09T15:19:54Z","isPatch":true,"sender":{"key":"kyle@kyleam.com","avatar":"https://avatars.githubusercontent.com/u/1297788?v=4"},"body":"Signed-off-by: Kyle Meyer <kyle@kyleam.com>\n---\n Documentation/gitworkflows.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt\nindex 926e044d0..ca11c7bda 100644\n--- a/Documentation/gitworkflows.txt\n+++ b/Documentation/gitworkflows.txt\n@@ -107,7 +107,7 @@ the unstable branch into the stable one.  Hence the following:\n .Merge upwards\n [caption=\"Rule: \"]\n =====================================\n-Always commit your fixes to the oldest supported branch that require\n+Always commit your fixes to the oldest supported branch that requires\n them.  Then (periodically) merge the integration branches upwards into each\n other.\n =====================================\n-- \n2.11.0\n\n"},{"id":"349825","messageId":"CABPp-BG_4WRP=-m7RfqAdYvOrM5CnByHZ=yghPqTdOcL2NGjhQ@mail.gmail.com","threadId":"48681","inReplyTo":"20180609151943.7387-1-kyle@kyleam.com","subject":"Re: [PATCH] gitworkflows: fix grammar in 'Merge upwards' rule","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2018-06-09T20:14:29Z","receivedAt":"2018-06-09T20:14:33Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"Hi Kyle,\n\nOn Sat, Jun 9, 2018 at 8:19 AM, Kyle Meyer <kyle@kyleam.com> wrote:\n> Signed-off-by: Kyle Meyer <kyle@kyleam.com>\n> ---\n>  Documentation/gitworkflows.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt\n> index 926e044d0..ca11c7bda 100644\n> --- a/Documentation/gitworkflows.txt\n> +++ b/Documentation/gitworkflows.txt\n> @@ -107,7 +107,7 @@ the unstable branch into the stable one.  Hence the following:\n>  .Merge upwards\n>  [caption=\"Rule: \"]\n>  =====================================\n> -Always commit your fixes to the oldest supported branch that require\n> +Always commit your fixes to the oldest supported branch that requires\n>  them.  Then (periodically) merge the integration branches upwards into each\n>  other.\n>  =====================================\n\nThanks for sending in the fix.\n\nReviewed-by: Elijah Newren <newren@gmail.com>\n"}]}