rewriting git history - yuck