Git workflow

gitworkflow.md

Before starting work on a feature, check out a topic branch

git checkout -b topic

If the branch is already in progress and already exists on the remote repo, check it out as a tracking branch

git checkout --track -b topic origin/topic

Push the branch to your remote repo so others can work on it

git push origin topic

Once done, squash the branch's commits down to one with an interactive rebase

git rebase master -i

Checkout master and pull

git checkout master git pull

Merge in the topic branch

git merge topic

Delete the branch locally and remotely

git branch -d topic

git push origin :topic