| commit | 1db658f5deb3cbdf04a7ed54424b99591ab3dfa1 | [log] [tgz] |
|---|---|---|
| author | Vincent Driessen <vincent@datafox.nl> | 周二 2月 02 22:51:35 2010 +0100 |
| committer | Vincent Driessen <vincent@datafox.nl> | 周二 2月 02 22:51:35 2010 +0100 |
| tree | 7f5dbfa7e2449e490781b914e776c89ccbb3da1d | |
| parent | eec73c6777b3ad4e752a778d8c95a16622f371a1 [diff] | |
| parent | c3b7db9d2a8d06d681c05d7cabc4e7de55de63f8 [diff] |
Merge branch 'feature/fix-installer' into develop
diff --git a/git-flow-feature b/git-flow-feature index ef4d526..fe10382 100644 --- a/git-flow-feature +++ b/git-flow-feature
@@ -294,7 +294,9 @@ gitflow_require_clean_working_tree # delete branch - git push $ORIGIN :refs/heads/$BRANCH + if [ $FLAGS_fetch -eq 1 ]; then + git push $ORIGIN :refs/heads/$BRANCH + fi git branch -d $BRANCH echo