diff --git a/lib/feature/start.rb b/lib/feature/start.rb index dae9daf..2fbde23 100644 --- a/lib/feature/start.rb +++ b/lib/feature/start.rb @@ -21,11 +21,11 @@ module Feature error "invalid feature branch: #{feature_name}" if standard_branches.include? feature_name git_fetch - git_pull current_branch - - git_local_branch_create feature_branch - + git_merge ['origin', current_branch].join('/') + git_branch feature_branch + git_checkout feature_branch git_push feature_branch + end end diff --git a/lib/shared/runnable.rb b/lib/shared/runnable.rb index 8c39944..a5173c8 100644 --- a/lib/shared/runnable.rb +++ b/lib/shared/runnable.rb @@ -136,6 +136,10 @@ module Shared run_cmd "git merge #{branch}" end + def git_branch (branch) + run_cmd "git branch #{branch}" + end + def git_push (branch) run_cmd "git push origin #{branch}" end