[PATCH] gitworkflows: fix grammar in 'Merge upwards' rule
From: Kyle Meyer <hidden>
Date: 2018-06-09 15:19:54
Subsystems: documentation, the rest
2 messages, 2 authors, 2018-06-09 · open the first message on its own page
From: Kyle Meyer <hidden>
Date: 2018-06-09 15:19:54
Signed-off-by: Kyle Meyer <redacted> --- 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. =====================================
--
2.11.0
From: Elijah Newren <hidden>
Date: 2018-06-09 20:14:33
Hi Kyle, On Sat, Jun 9, 2018 at 8:19 AM, Kyle Meyer [off-list ref] wrote:
Signed-off-by: Kyle Meyer <redacted> --- 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 <redacted>