threads / patch / 48681

patchgitworkflows: fix grammar in 'Merge upwards' rule

Subject: [PATCH] gitworkflows: fix grammar in 'Merge upwards' rule

## tl;dr

2 messages between Jun 9, 2018 and Jun 9, 2018. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Kyle Meyer· Jun 9, 2018, 15:19 UTC · lore
Signed-off-by: Kyle Meyer <kyle@kyleam.com>
---
 Documentation/gitworkflows.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to Documentation/gitworkflows.txt +1 −1
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· Jun 9, 2018, 20:14 UTC · re: Kyle Meyer · lore

Re: [PATCH] gitworkflows: fix grammar in 'Merge upwards' rule

Hi Kyle,
On Sat, Jun 9, 2018 at 8:19 AM, Kyle Meyer <kyle@kyleam.com> wrote:
Show 18 quoted lines
> 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>

← back to recent threads