From 75a9c9802af01ecfa5283ca3d14117d7210850dd Mon Sep 17 00:00:00 2001
From: Anthony Truskinger <anthony.truskinger@gmail.com>
Date: Fri, 17 Feb 2017 14:32:25 +1000
Subject: [PATCH] Added a simplified release protocol

---
 git-flow.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

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-<version> develop
+# change version numbers: app/models/settings.rb
+# update CHANGELOG.md
+git commit -am "increment version to <version>"
+git checkout master
+git merge --no-ff release-<version>
+git tag -a <version>
+git checkout develop
+git merge --no-ff release-<version>
+git push --tags
+git push
+```
\ No newline at end of file