thoughtbot Git Process

git

BEFORE: start trajectory story

* run specific tests wrote (eg: rspec spec/decorators/event_decorator_spec.rb:5)

rake

git status

git diff

git add .

git commit -v 

* Comments in this format: 

This is my commit comment

* Extra thing 1
* Extra thing 2

git status

git log

git up

-> if rebase brings in new stuff, bmr

git push 

* code review - REVIEW YOURSELF FIRST - Ask for comments in campfire. Open branch on GitHub, look at comments.
 
git rebase -i origin/master -> replace all picks but first with s

git up

bmr

git log - make sure commit looks good

git push -f

git checkout master

git up

git down your-branch-name (eg: jy-check-other-invitee-count)

rake

git push

git push staging master && heroku run rake db:migrate --app scheddo-staging 

* celebrate /ship     

* test on staging

* finish/deliver trajectory story

grb rm branch-name - removes remote branch and local branch (that you were just working on)

git remote prune origin