commit bd4a1f121fde7247689ec907131240b9f2df3db6
author Vincent Driessen <vincent@datafox.nl> 周二 1月 26 21:59:33 2010 +0100
committer Vincent Driessen <vincent@datafox.nl> 周二 1月 26 21:59:33 2010 +0100
tree e0b8b7a66c129e8b40ef6bba9b6c266499385521
parent f781242368951591bd3b9519f2a057d07c36e646
parent c7bbfcf42d5eceafced1cf4cb1f508a1a148fcd6

Merge branch 'review' into develop

bump-version

diff --git a/bump-version b/bump-version
index 60eac0d..f8ae3de 100755
--- a/bump-version
+++ b/bump-version
@@ -8,6 +8,6 @@
 	exit 1
 fi
 
-echo "GITFLOW_VERSION=$1" > gitflow-version
-git add gitflow-version
-git commit -m "Bumped version number to $1" gitflow-version
+echo "GITFLOW_VERSION=$1" > git-flow-version
+git add git-flow-version
+git commit -m "Bumped version number to $1" git-flow-version

git-flow-version

diff --git a/git-flow-version b/git-flow-version
index c375924..ae551c6 100644
--- a/git-flow-version
+++ b/git-flow-version
@@ -1 +1 @@
-GITFLOW_VERSION=0.1
+GITFLOW_VERSION=0.2-dirty