This sounds pretty much what I described in http://www.mos6581.org/git_subtree_alternative http://www.mos6581.org/git_subtree_alternative. This solution splits

This sounds pretty much what I described in http://www.mos6581.org/git_subtree_alternative http://www.mos6581.org/git_subtree_alternative. This solution splits your changes between different branches at the time of commit, instead of afterwards like git-subtree does. While I do present a proof-of-concept implementation using hooks, a proper implementation would require some changes to the git client, I imagine.