gitflow

http://nvie.com/posts/a-successful-git-branching-model/
procedure for working with a sane graph of git branches, from Vincent Driessen

more info and tools from
https://github.com/nvie/gitflow