Maybe this is a good time to look at #fossil again as a git alternative - I'm not saying I don't like git but it is always good to diversify...