From 58ebd936cc92441ec672b96e98ad12b34b3cb4a8 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 9 Jun 2018 11:19:43 -0400 Subject: gitworkflows: fix grammar in 'Merge upwards' rule Signed-off-by: Kyle Meyer Reviewed-by: Elijah Newren Signed-off-by: Junio C Hamano --- Documentation/gitworkflows.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/gitworkflows.txt') 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. ===================================== -- cgit v1.2.3