Skip to content

G
gitflow
Commit e17663f8 authored by Daniel Truemper's avatar Daniel Truemper
Browse files
Options

Merge branch 'cleanup' into develop

parents 093a1477 e4736ce5
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
gitflow
View file @ e17663f8
...@@ -31,10 +31,6 @@ check_incoming() { ...@@ -31,10 +31,6 @@ check_incoming() {
fi fi
} }
gitflow_check_clean_working_tree() {
echo "Working tree clean."
}
if [ $# -lt 2 ]; then if [ $# -lt 2 ]; then
usage usage
exit 1 exit 1
......
gitflow-feature
View file @ e17663f8
...@@ -18,9 +18,12 @@ usage() { ...@@ -18,9 +18,12 @@ usage() {
} }
parse_args() { parse_args() {
# TODO: Implement the optional base argument
FEATURE="$1" FEATURE="$1"
BASE="develop" if [ $# -eq 2 ]; then
BASE="$2"
else
BASE="develop"
fi
if [ "$FEATURE" = "" ]; then if [ "$FEATURE" = "" ]; then
echo "Missing argument <release>." echo "Missing argument <release>."
usage usage
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment