This is the current git workflow we are using at work, your mileage may vary:




Resources

• http://cheat.errtheblog.com/s/git 
• http://yanpritzker.com/gitbook.html#Keeping+a+topic+branch+in+sync+with+its+parent 
• http://yanpritzker.com/gitbook.html#One+branch+per+bug 
• http://gitready.com/beginner/2009/02/02/push-and-delete-branches.html 
• http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html 
• http://sleeplessgeek.blogspot.com/2011/03/using-git-cherry-pick.html