create git commands

2015-06-06 07:59:12 -04:00
parent d7634a8653
commit be68a8b6c8
6 changed files with 59 additions and 19 deletions
--- a/lib/feature/rebase.rb
+++ b/lib/feature/rebase.rb
@@ -24,16 +24,16 @@ module Feature
      error "USAGE: feature rebase" unless standard_branch
      error "invalid feature branch: #{feature_branch}" if standard_branches.include? feature_branch

-      run_cmd "git checkout #{standard_branch}"
-      run_cmd "git pull origin #{standard_branch}"
-      run_cmd "git checkout #{feature_branch}"
-      run_cmd "git rebase #{standard_branch}"
+      git_checkout standard_branch
+      git_pull standard_branch
+      git_checkout feature_branch
+      git_rebase standard_branch

      if remote_branch != ""
-        run_cmd "git push origin :#{feature_branch}"
+        git_remote_branch_delete feature_branch
      end

-      run_cmd "git push origin #{feature_branch}"
+      git_push feature_branch
    end
  end