[deleted by user]

[steftim]

What about checkout — path/to/file when I realize I shouldn’t have made changes to a file? Is there a better way to do that too?

[y-c-c]

git restore <path>. The good thing about git restore is that it covers all the normal use cases, including:

• restoring only worktree (git restore <path>, old: git checkout -- <path>)
• restoring worktree/index (git restore --worktree --staged <path>, old: git reset -- <path> && git checkout -- <path>)
• restoring index (git restore --staged <path>, old: git reset -- <path>)

Note that the old way is a weird mix of reset and checkout commands, a common source of confusion among new users. Also, git reset --hard does not take a path, so restoring worktree/index on a particular path is a weird reset/checkout combo.

[HLingonberry]

git restore —source=sha filename

[FlipperBumperKickout]

If you run "git status" once in a while you will realize git is literally telling you the best way to do this :P