Thank you, using --index does work! Now the trick is to actually remember to use it in this case, since it doesn't seem the change can be restored if you forget to use it the first time you pop/apply. Then the fix is to `git mv` the files back to the original name, and to the new name again. Thanks Chrissy Wainwright -- Six Feet Up, Inc. Python & Cloud Expert Consulting Direct Line: +1 (317) 861-5948 x(604) Email: chrissy@xxxxxxxxxxxxx https://sixfeetup.com On 12/14/19, 5:05 PM, "Kyle Meyer" <kyle@xxxxxxxxxx> wrote: Kyle Meyer <kyle@xxxxxxxxxx> writes: > > $ git init > $ touch foo && git add foo && git commit -mfoo Sorry, I forgot to paste in the `git rm foo` step here. > $ git stash > $ git stash apply > Removing foo > On branch master > Changes not staged for commit: > deleted: foo > > no changes added to commit
