Git got a bit screwed up