Git works better when changes are not made when renaming.