What is the right way to undo a rename in git, like:
git mv file1 file2
Non-cheeky answer:
git mv file2 file1
Updates the index for both old and new paths automatically.
Check documentation of git mv