diff --git a/git-flow.md b/git-flow.md index bca17e19..57368d64 100644 --- a/git-flow.md +++ b/git-flow.md @@ -69,3 +69,24 @@ git push --tags git push ``` +## Fast release protocol + +**WARNING**: The following steps assume: +- all tests pass (e.g. on CI) +- all gems are updated +- all master patches have been (correctly) previously merged into develop + +``` +git checkout develop +git checkout -b release- develop +# change version numbers: app/models/settings.rb +# update CHANGELOG.md +git commit -am "increment version to " +git checkout master +git merge --no-ff release- +git tag -a +git checkout develop +git merge --no-ff release- +git push --tags +git push +``` \ No newline at end of file