updates: optimize rebase and merge

2019-01-30 21:51:39 -05:00
parent bfaf1a457f
commit 0015d4d0ff
2 changed files with 14 additions and 9 deletions
--- a/lib/feature/rebase.rb
+++ b/lib/feature/rebase.rb
@@ -21,17 +21,13 @@ module Feature
      error "USAGE: feature rebase" unless standard_branch
      error "invalid feature branch: #{feature_branch}" if standard_branches.include? feature_branch

-      git_checkout standard_branch
      git_fetch
-      git_pull standard_branch
-      git_checkout feature_branch
-      git_rebase standard_branch
-
+      git_rebase ['origin', standard_branch].join('/')
      if remote_branch != ""
        git_remote_branch_delete feature_branch
      end
-
      git_push feature_branch
+      
    end
  end