it's quite difficult to maintain a quilt like workflow with plain git

I've tried it