https://github.com/nvie/gitflow works really well. The original post http://nvie.com/posts/a-successful-git-branching-model/ was really compelling, and using it has really helped, at least what I do.