summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-18 17:18:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-18 17:18:42 (GMT)
commita6260826292bc00ea8829c1826b7f2f34444d2f2 (patch)
tree2edddf662c103733b7450957731887a728866a90 /Documentation
parente638899470621738f32ef75dc0a092f6475a4a6e (diff)
parent58ebd936cc92441ec672b96e98ad12b34b3cb4a8 (diff)
downloadgit-a6260826292bc00ea8829c1826b7f2f34444d2f2.zip
git-a6260826292bc00ea8829c1826b7f2f34444d2f2.tar.gz
git-a6260826292bc00ea8829c1826b7f2f34444d2f2.tar.bz2
Merge branch 'km/doc-workflows-typofix'
Typofix. * km/doc-workflows-typofix: gitworkflows: fix grammar in 'Merge upwards' rule
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 926e044..ca11c7b 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.
=====================================