I wonder if you might prefer something like Darcs to Git. I've heard a lot of amnbivalence about Darcs as a practical software project (just seems to be losing momentum, and it has never matched Git for speed), but I wonder if the model is more apt for writing than Git.