Skip to content

Commit

Permalink
Merge branch 'km/doc-workflows-typofix'
Browse files Browse the repository at this point in the history
Typofix.

* km/doc-workflows-typofix:
  gitworkflows: fix grammar in 'Merge upwards' rule
  • Loading branch information
gitster committed Jun 18, 2018
2 parents e638899 + 58ebd93 commit a626082
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Documentation/gitworkflows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
=====================================
Expand Down

0 comments on commit a626082

Please sign in to comment.