Removed the --squash option until it's fully implemented.

dominhhai · Feb 22, 2010 · 05e6586 · 05e6586
1 parent e0d8af3
commit 05e6586
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/git-flow-feature b/git-flow-feature
@@ -179,7 +179,6 @@ cmd_start() {
 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