From: Kyle Meyer <kyle@kyleam.com>
Date: Sat, 9 Jun 2018 15:19:43 +0000 (-0400)
Subject: gitworkflows: fix grammar in 'Merge upwards' rule
X-Git-Tag: v2.18.0~20^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58ebd936cc92441ec672b96e98ad12b34b3cb4a8;p=thirdparty%2Fgit.git

gitworkflows: fix grammar in 'Merge upwards' rule

Signed-off-by: Kyle Meyer <kyle@kyleam.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
index 177610e44e..06dcdbf400 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.
 =====================================