Web lists-archives.com

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




Hi Kyle,

On Sat, Jun 9, 2018 at 8:19 AM, Kyle Meyer <kyle@xxxxxxxxxx> wrote:
> Signed-off-by: Kyle Meyer <kyle@xxxxxxxxxx>
> ---
>  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@xxxxxxxxx>