jimeh/common-flow
1
0
Fork 0
mirror of https://github.com/jimeh/common-flow.git synced 2026-02-19 01:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change "off of" to "from", fixing #19

Browse Source
This commit is contained in:
Jim Myhrberg
2017-12-28 21:40:47 +00:00
parent 6f08b0e41c
commit 7cef6f71cc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common-flow.md
View File

@@ -191,8 +191,8 @@ interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119).
MUST be created from the relevant release tag. For example if the master MUST be created from the relevant release tag. For example if the master
branch is on version 2.11.4 and there is a security fix for all 2.9.x branch is on version 2.11.4 and there is a security fix for all 2.9.x
releases, the latest of which is "2.9.7". Create a new branch called releases, the latest of which is "2.9.7". Create a new branch called
"release-2.9" off of the "2.9.7" release tag. The security fix release "release-2.9" from the "2.9.7" release tag. The security fix release will
will then end up being version "2.9.8". then end up being version "2.9.8".
5. To create a new release from a long-term release branch, you MUST follow 5. To create a new release from a long-term release branch, you MUST follow
the same process as a release from the master branch, except the the same process as a release from the master branch, except the
long-term release branch takes the place of the master branch. long-term release branch takes the place of the master branch.
@@ -246,7 +246,7 @@ really change much:
- You create change branches instead of feature branches, without the need of a - You create change branches instead of feature branches, without the need of a
"feature/" or "change/" prefix in the branch name. "feature/" or "change/" prefix in the branch name.
- Change branches are typically created off of and merged back into "master" - Change branches are typically created from and merged back into "master"
instead of "develop". instead of "develop".
- Creating a release is done by simply creating a git tag, typically on the - Creating a release is done by simply creating a git tag, typically on the
master branch. master branch.