Git history being all out of sync.