summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2018-06-09 15:19:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-12 17:19:48 (GMT)
commit58ebd936cc92441ec672b96e98ad12b34b3cb4a8 (patch)
treee4bc9835041d7f47201b0b3df4b003e1b02f3c1f /Documentation
parentd33c87517a85f544159b2efa406136dde18a5b9f (diff)
downloadgit-58ebd936cc92441ec672b96e98ad12b34b3cb4a8.zip
git-58ebd936cc92441ec672b96e98ad12b34b3cb4a8.tar.gz
git-58ebd936cc92441ec672b96e98ad12b34b3cb4a8.tar.bz2
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>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/gitworkflows.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
index 177610e..06dcdbf 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.
=====================================