[guelo]

And the accompanying tools for it: https://github.com/nvie/gitflow