| commit | 7d0a4096f7acb5c1b29a22f2789e0ac5c51c28de | [log] [tgz] |
|---|---|---|
| author | Daniel Truemper <truemped@googlemail.com> | 周一 1月 25 09:48:14 2010 +0100 |
| committer | Daniel Truemper <truemped@googlemail.com> | 周一 1月 25 09:48:14 2010 +0100 |
| tree | 23a07117b7f5fb851fc77082496753e5aed533fe | |
| parent | e17663f88739423d6b197ff5e0371f796124f32b [diff] | |
| parent | 3ba8b3d676a706b583d1fa14fd74559c99c4f28f [diff] |
Merge branch 'tag-releases' into develop
diff --git a/gitflow-release b/gitflow-release index 2096dc6..b8e4810 100755 --- a/gitflow-release +++ b/gitflow-release
@@ -41,6 +41,7 @@ gitflow_check_clean_working_tree echo "git checkout master" echo "git merge --no-ff release-$RELEASE" + echo "git tag $RELEASE" echo "git checkout develop" echo "git merge --no-ff release-$RELEASE" echo "git branch -d release-$RELEASE"