title: Renaming with Git: Using git mv vs deleting a file and adding another
body: <p>I 'renamed' a file manually by deleting the old one and adding another with the new name. How do I undo this in the commit history and use git mv instead?I need to rebase my feature branch to the updated parent where the old file name is still being used. I don't want to lose the changes from both the old-name file and new-name file.</p>