summaryrefslogtreecommitdiffstats
path: root/gitworkflows.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-18 11:32:19 -0700
committerJunio C Hamano <gitster@pobox.com>2018-06-18 11:32:19 -0700
commit14e6683c9ffe288fd03fe38170e3d255056a7841 (patch)
treea3248ef8aa66bb4132fd6442a25d39a151b8173b /gitworkflows.txt
parent49bcf742a2710071f132cc7efcad8c4f4d7f0984 (diff)
downloadgit-htmldocs-14e6683c9ffe288fd03fe38170e3d255056a7841.tar.gz
Autogenerated HTML docs for v2.18.0-rc2-76-g242ba
Diffstat (limited to 'gitworkflows.txt')
-rw-r--r--gitworkflows.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitworkflows.txt b/gitworkflows.txt
index 926e044d0..ca11c7bda 100644
--- a/gitworkflows.txt
+++ b/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.
=====================================