Merge branch 'develop' of git://github.com/nvie/gitflow into develop
Conflicts:
gitflow
diff --git a/git-flow b/git-flow
index 283c779..c85625d 100755
--- a/git-flow
+++ b/git-flow
@@ -28,11 +28,14 @@
has() { [[ " ${*:2} " == *" $1 "* ]]; }
usage() {
- echo "usage: git flow <cmd> <btype> <args>"
+ . "$GITFLOW_DIR/git-flow-version"
+ echo "gitflow, version $GITFLOW_VERSION"
echo
- echo "<btype> can be any of: feature, release, hotfix, support"
+ echo "usage: git flow <cmd> <type> <args>"
echo
- echo "Try 'git flow help <btype>' for details."
+ echo "<type> can be any of: feature, release, hotfix, support"
+ echo
+ echo "Try 'git flow help <type>' for details."
}
main() {