jlslew / git-subtree-merges

https://help.github.com/articles/about-git-subtree-merges