Great question! Let's break this down clearly:

First, let's recap what your original two commands do:

• git reset HEAD -- <file>: Removes the file from the Git staging area (undoes the git add you ran on it)
• git checkout -- <file>: Restores the working copy of the file to match the version in the HEAD commit (discards any uncommitted changes in the working directory)

If you're using Git 2.23 or newer (you can check your version with git --version), there's a single, unified command that handles both actions in one step:

git restore --staged --worktree <file>

You can even use shorthand flags to make it more concise:

git restore -SW <file>

What each part does: #

• --staged (short -S): Clears the file from the staging area (exactly what git reset HEAD -- <file> does)
• --worktree (short -W): Overwrites the working directory copy with the version from HEAD (matches the effect of git checkout -- <file>)

For older Git versions (pre-2.23): #

If you can't upgrade Git, you can create a custom alias to combine the two commands into one. Run this once to set it up globally:

git config --global alias.unstage-restore '!git reset HEAD -- "$1" && git checkout -- "$1"'

Then you can use the alias like this whenever you need:

git unstage-restore <file>

A quick heads-up: All these commands will discard uncommitted changes to the target file, so double-check you don't need those changes before running them!

内容的提问来源于stack exchange，提问作者Jim