summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-05-16 16:43:04 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-05-16 16:43:04 -0300
commit79a87b0e7536299ba49b559e8bcdd0c96291f413 (patch)
tree71a0bbcd4d71e391c0a718bb462a4040080e0321
parente32a1a5bc4d7331e129df173260fc754ff20c0da (diff)
downloadkeyringer-79a87b0e7536299ba49b559e8bcdd0c96291f413.tar.gz
keyringer-79a87b0e7536299ba49b559e8bcdd0c96291f413.tar.bz2
Release workflow with git-flow
-rw-r--r--development.mdwn7
1 files changed, 5 insertions, 2 deletions
diff --git a/development.mdwn b/development.mdwn
index 91ddc87..67c6456 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -52,9 +52,10 @@ We use [git-flow](https://github.com/nvie/gitflow) for the development workflow.
Release workflow
----------------
-Go to master branch
+Go to develop branch and start a new release
- git checkout master
+ git checkout develop
+ git flow release start VERSION
Prepare the source code:
@@ -64,6 +65,8 @@ Prepare the source code:
Create and upload a new release:
+ git flow release finish $VERSION
+ git checkout master
make release
Update the debian branch: