Git rebase workflow
git checkout -b <branchname>
git add
git commit -m "description of changes"
git checkout master
git pull --rebase
git checkout <branchname>
git rebase master
git checkout master
git merge <branchname>
git push
git rebase --interactive HEAD~N
git flow init # setup project to use git-flow
git flow feature start <feature_name> # creates a new feature branch called <feature_name>
git flow feature finish <feature_name> # merge feature back into develop branch
git flow release start <version> # merge develop to release