What is the difference between git restore --staged some-file and git checkout -- some-file?

Question

I am exploring the possible options to undo something that has been done with git. I came across this post and I see that there are 3 options git reset, git checkout and git restore.

I think I sort of understand what git reset does (not entirely but I think that's a separate question), however I don't understand what difference is there in running git checkout -- some_file and git restore --staged some_file

Is there a difference in how the two commands change the files in the working directory?

VonC_6309 · Answer

To sumarize Torek's answer:

git checkout -- somefile overwrite working tree with the contents in the index
git restore --staged -- somefile restore the index content from HEAD for that file (the old git reset -- file, typically used to unstage a modified file added by error)

Torek insists on the fact git restore --source --worktree -- somefile is new (cannot be done with checkout): the abillity to restore a file in the workig tree without touching the index.

What is the difference between git restore --staged some-file and git checkout -- some-file?

1 Answers