Merge branch 'cleanup' into develop
diff --git a/gitflow b/gitflow
index e8a4d32..8d6e9ac 100755
--- a/gitflow
+++ b/gitflow
@@ -31,10 +31,6 @@
fi
}
-gitflow_check_clean_working_tree() {
- echo "Working tree clean."
-}
-
if [ $# -lt 2 ]; then
usage
exit 1
diff --git a/gitflow-feature b/gitflow-feature
index ccc99be..6551b99 100755
--- a/gitflow-feature
+++ b/gitflow-feature
@@ -18,9 +18,12 @@
}
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