make master and develop branch names configurable
diff --git a/git-flow-feature b/git-flow-feature
index fc7a794..b48e893 100755
--- a/git-flow-feature
+++ b/git-flow-feature
@@ -34,7 +34,7 @@
parse_args() {
NAME="$1"
- BASE="${2:-develop}"
+ BASE="${2:-$DEVELOP_BRANCH}"
if [ "$NAME" = "" ]; then
echo "Missing argument <name>."
usage
@@ -54,9 +54,9 @@
# sanity checks
gitflow_check_clean_working_tree
gitflow_require_branch_absent $BRANCH
- if [ "$BASE" = "develop" ]; then
- git fetch origin develop
- gitflow_require_branches_equal develop origin/develop
+ if [ "$BASE" = "$DEVELOP_BRANCH" ]; then
+ git fetch origin $DEVELOP_BRANCH
+ gitflow_require_branches_equal $DEVELOP_BRANCH origin/$DEVELOP_BRANCH
fi
# create branch
@@ -83,8 +83,8 @@
if has origin/$BRANCH $REMOTE_BRANCHES; then
gitflow_require_branches_equal $BRANCH origin/$BRANCH
fi
- if [ "$BASE" = "develop" ]; then
- gitflow_require_branches_equal develop origin/develop
+ if [ "$BASE" = "$DEVELOP_BRANCH" ]; then
+ gitflow_require_branches_equal $DEVELOP_BRANCH origin/$DEVELOP_BRANCH
fi
# merge into BASE