Added git-flow-develop

varunkvv · Aug 21, 2013 · eb01738 · eb01738
1 parent 15aab26
commit eb01738
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/git-flow-develop b/git-flow-develop
@@ -0,0 +1,23 @@
+cmd_merge() {
+
+	if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
+		git_do fetch -q "$ORIGIN" "$BRANCH"
+		git_do fetch -q "$ORIGIN" "$DEVELOP_BRANCH"	
+		git_do push "$ORIGIN" "$DEVELOP_BRANCH"
+	fi
+	if has "$ORIGIN/$DEVELOP_BRANCH" $(git_remote_branches); then
+		require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
+	fi
+
+
+	git_do checkout "$MASTER_BRANCH"
+	git_do merge --squash "$DEVELOP_BRANCH"
+	git_do commit
+	git_do merge "$DEVELOP_BRANCH"
+}
+
+init() {
+  require_git_repo
+  require_gitflow_initialized
+  gitflow_load_settings
+}