Merge branch 'km/doc-workflows-typofix'

Typofix.

* km/doc-workflows-typofix:
  gitworkflows: fix grammar in 'Merge upwards' rule
This commit is contained in:
Junio C Hamano 2018-06-18 10:18:42 -07:00
commit a626082629

View file

@ -107,7 +107,7 @@ the unstable branch into the stable one. Hence the following:
.Merge upwards .Merge upwards
[caption="Rule: "] [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 them. Then (periodically) merge the integration branches upwards into each
other. other.
===================================== =====================================