diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-05-16 16:47:06 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-05-16 16:47:06 -0300 |
| commit | b19b9318d0fe0de9444dda6856a17384b8b9450d (patch) | |
| tree | 26ed0eb9ab0ff54a70d6252dd35ca7f7e5cb5e6a /development.mdwn | |
| parent | e32a1a5bc4d7331e129df173260fc754ff20c0da (diff) | |
| parent | 4edea3d52e0c04651508fba9bae6ed0d81ccaa01 (diff) | |
| download | keyringer-b19b9318d0fe0de9444dda6856a17384b8b9450d.tar.gz keyringer-b19b9318d0fe0de9444dda6856a17384b8b9450d.tar.bz2 | |
Merge branch 'release/0.3.4' into develop
Diffstat (limited to 'development.mdwn')
| -rw-r--r-- | development.mdwn | 7 |
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: |