I do something kind of similar using stgit[1]. I do everything on a single branch creating patches with stgit. stgit lets you easily change the order of commit

I do something kind of similar using stgit[1]. I do everything on a single branch creating patches with stgit. stgit lets you easily change the order of commits (a lot like quilt[2], but more robust because it's using git underneath). When features are ready, I just cherry pick them over to master and push upstream. [1]http://www.procode.org/stgit/ http://www.procode.org/stgit/ [2]https://en.wikipedia.org/wiki/Quilt_(software) https://en.wikipedia.org/wiki/Quilt_(software)