Toady, a new article of git workflows appeared in HN. The nice thing of it is that at my workplace, we use exactly the same workflow. I just post it here for future reference
And now that we're at it, I link another git workflow related post that talks about merge --squash. A nice thing to make your history cleaner
Btw, I recently discovered a couple of interesting git man pages: gittutorial and gitworkflows. Interesting information there too.