Skip to content
This repository
Browse code

Update master before starting a new feature.

We were doing this already with `hotfix start`; why weren't we doing it
with `feature start`?
  • Loading branch information...
commit 6ea8be0f4f647f376e044e5104734668af3d578f 1 parent e42c56d
James Pearson xiongchiamiov authored

Showing 1 changed file with 3 additions and 0 deletions. Show diff stats Hide diff stats

  1. +3 0  feature.rb
3  feature.rb
@@ -18,9 +18,12 @@
18 18
19 19 exit if !confirm("Create feature branch named: '#{feature}' ?")
20 20
  21 + Git::run_safe("git checkout #{Git::development_branch}")
  22 + Git::run_safe("git pull --rebase")
21 23 Git::run_safe("git branch \"#{feature}\" #{Git::development_branch}")
22 24 Git::run_safe("git checkout \"#{feature}\"")
23 25 Git::run_safe("git submodule --quiet update --init --recursive")
  26 +
24 27 # Automatically setup remote tracking branch
25 28 Git::run_safe("git config branch.#{feature}.remote origin")
26 29 Git::run_safe("git config branch.#{feature}.merge refs/heads/#{feature}")

0 comments on commit 6ea8be0

Please sign in to comment.
Something went wrong with that request. Please try again.