Merge branch 'release/0.2' into develop

nvie · nvie · commit b554186c4c17 · 2010-02-24T01:56:06.000+01:00
diff --git a/README.mdown b/README.mdown
@@ -1,7 +1,7 @@
 git-flow
 ========
 A collection of Git extensions to provide high-level repository operations
-for Vincent Driessen's [branching model](http://nvie.com/archives/323 "original
+for Vincent Driessen's [branching model](http://nvie.com/git-model "original
 blog post").
 
 
diff --git a/git-flow-version b/git-flow-version
@@ -11,7 +11,7 @@
 # Copyright (c) 2010 by Vincent Driessen
 # Copyright (c) 2010 by Benedikt Böhm
 #
-GITFLOW_VERSION=0.2-dirty
+GITFLOW_VERSION=0.2
 
 usage() {
 	echo "usage: git flow version"

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`# Copyright (c) 2010 by Vincent Driessen`
`12`	`12`	`# Copyright (c) 2010 by Benedikt Böhm`
`13`	`13`	`#`
`14`		`-GITFLOW_VERSION=0.2-dirty`
	`14`	`+GITFLOW_VERSION=0.2`
`15`	`15`
`16`	`16`	`usage() {`
`17`	`17`	`echo "usage: git flow version"`