Git Flow

git_flow.md

Your workflow should be:

git pull origin master # get the latest merged code
git checkout -b al-uber-cool-feature # create a feature branch
<code code code> # only one thing at a time!!
<test test test>
git add <filespec> # add the files you changed
git commit -sm "What I changed"
git push

often, but not on every commit:

git checkout master
git pull origin master
git checkout al-uber-cool-feature
git merge master
<test test test>
git commit -sm "Merge upstream updates"
git push

release time!

git checkout master
git pull
git merge al-uber-cool-feature
<test test test>
git push origin master
git branch -d al-uber-cool-feature #delete local branch
git push origin :al-uber-cool-feature #clean up refs on server

I captured this flow after a conversation with Nathan Cerny