some git screwage

I've probably messed this up.