Merge branch 'cleanup' into develop

e17663f8 · Daniel Truemper · 093a1477 · e4736ce5 · e17663f8 · e17663f8
Commit e17663f8 authored Jan 24, 2010 by Daniel Truemper
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

gitflow gitflow +0 -4

gitflow-feature gitflow-feature +5 -2

No files found.
--- a/gitflow
+++ b/gitflow
@@ -31,10 +31,6 @@ check_incoming() {
 	fi
 }

-gitflow_check_clean_working_tree() {
-	echo "Working tree clean."
-}
-
 if [ $# -lt 2 ]; then
 	usage
 	exit 1

--- a/gitflow-feature
+++ b/gitflow-feature
@@ -18,9 +18,12 @@ usage() {
 }

 parse_args() {
-	# TODO: Implement the optional base argument
 	FEATURE="$1"
-	BASE="develop"
+    if [ $# -eq 2 ]; then
+        BASE="$2"
+    else
+        BASE="develop"
+    fi
 	if [ "$FEATURE" = "" ]; then
 		echo "Missing argument <release>."
 		usage