My Git development workflow

git_workflow.txt

# Based on http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html

# Start working on new feature/fix
git checkout -b <feature/fix branch name>

# On a regular basis, rebase against upstream
git fetch origin master
git rebase origin/master

# When feature/fix is finished, rebase and squash commits into fewer
# (pick the first commit line, and squash the rest)
git rebase -i origin/master

# Merge feature/fix branch with local master
git checkout master
git merge <feature/fix branch name>

# Push local master upstream
git push origin master