| commit | 05e658683ae3c568ef08ca61161fc5c75a636992 | [log] [tgz] |
|---|---|---|
| author | Vincent Driessen <vincent@datafox.nl> | 周一 2月 22 21:09:30 2010 +0100 |
| committer | Vincent Driessen <vincent@datafox.nl> | 周一 2月 22 21:09:30 2010 +0100 |
| tree | d85e63b95083f63c115a6684123e3ed73919b0c3 | |
| parent | e0d8af3beccb5bc4a1b2ccc90bd6a4cc5c4fe210 [diff] |
Removed the --squash option until it's fully implemented.
diff --git a/git-flow-feature b/git-flow-feature index 0256e8a..aa7632a 100644 --- a/git-flow-feature +++ b/git-flow-feature
@@ -179,7 +179,6 @@ cmd_finish() { DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F DEFINE_boolean rebase false 'rebase instead of merge' r - DEFINE_boolean squash false 'squash all commits when rebasing (implies --rebase)' s parse_args "$@" expand_nameprefix_arg