| commit | 53e9c7680a2892ceeb5a21c11367940eca8407a0 | [log] [tgz] |
|---|---|---|
| author | Vincent Driessen <vincent@3rdcloud.com> | 周二 7月 10 02:18:02 2012 -0700 |
| committer | Vincent Driessen <vincent@3rdcloud.com> | 周二 7月 10 02:18:02 2012 -0700 |
| tree | 9cca9d11f4807113fce231e6b9717edb51074afc | |
| parent | aa93d2346f840e16a05c6546e1e22c1dddfbc997 [diff] | |
| parent | b72a395ba6d0659f1008754000bb6a066a7fb551 [diff] |
Merge pull request #235 from oddnoc/feature/112-init-fix Prevent error message on git flow init.
diff --git a/git-flow b/git-flow index 19c337e..cdf0e07 100755 --- a/git-flow +++ b/git-flow
@@ -109,7 +109,7 @@ fi # run the specified action - if [ $SUBACTION != "help" ]; then + if [ $SUBACTION != "help" ] && [ $SUBCOMMAND != "init" ] ; then init fi cmd_$SUBACTION "$@"