From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Jun 2018 17:18:42 +0000 (-0700)
Subject: Merge branch 'km/doc-workflows-typofix'
X-Git-Tag: v2.18.0~20
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/a6260826292bc00ea8829c1826b7f2f34444d2f2?hp=e638899470621738f32ef75dc0a092f6475a4a6e

Merge branch 'km/doc-workflows-typofix'

Typofix.

* km/doc-workflows-typofix:
gitworkflows: fix grammar in 'Merge upwards' rule
---

diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
index 926e044d09..ca11c7bdaf 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.
 =====================================