Merge branch 'release/0.4' into develop

vinbarnes · Oct 18, 2010 · ee7edbe · ee7edbe
2 parents e1ec57d + 1c289cf
commit ee7edbe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Changes.mdown b/Changes.mdown
@@ -1,8 +1,19 @@
 0.4:
 ---
-Release date: ???
+Release date: **2010/10/18**
 
-(No changes yet.)
+* The flag parsing issues of git-flow subcommands are solved for most
+  platforms.
+
+* `git flow {feature,hotfix,release} finish` now takes a `-k` flag, to keep the
+  branch around after finishing.
+
+* `git flow release finish` takes a `-n` flag, to skip tagging.
+
+* For consistency, `git flow {release,hotfix}` now, too, have a `publish` and
+  `track` subcommand, just like `feature`.
+
+* Various minor fixes.
 
 
 0.3:

diff --git a/git-flow-version b/git-flow-version
@@ -36,7 +36,7 @@
 # policies, either expressed or implied, of Vincent Driessen.
 #
 
-GITFLOW_VERSION=0.4-dev
+GITFLOW_VERSION=0.4
 
 usage() {
 	echo "usage: git flow version"