I as a rule don’t use git directly like that.

I creat functions that stash first and take the desired action

vim recently had my back when I rm a file prematurely. I recreated the file with the same name and then did an undo and the blank document became the last saved version.

Hopefully undotree or mundo is a part of your stack