From eb0173843bb35827f183bb1c6a423604c43f62fc Mon Sep 17 00:00:00 2001 From: Varun Vijayaraghavan Date: Wed, 21 Aug 2013 14:49:32 -0400 Subject: [PATCH] Added git-flow-develop --- git-flow-develop | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 git-flow-develop diff --git a/git-flow-develop b/git-flow-develop new file mode 100755 index 000000000..90d80ae8a --- /dev/null +++ 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 +} \ No newline at end of file