the art of forgetting new files during rebase -i