To unstage a file in Git without losing changes, use git reset HEAD <file-name> to remove it from the staging area while keeping edits intact. To unstage all files, run git reset. For partial unstaging, use git reset -p <file-name> to interactively remove specific change hunks. If you’ve already committed, use git reset --soft HEAD~1 to move the commit back to staging or git reset HEAD~1 -- <file-name> to remove a file from the last commit while keeping it locally. These commands help refine what gets included in your next commit efficiently.

If you've added a file to the Git staging area by mistake or changed your mind about including it in the next commit, there are straightforward ways to unstage it. The most common method involves using git reset, but depending on what exactly you want to do, there are a few variations.

How to unstage a file without changing its content

The standard command for removing a file from the staging area while keeping the changes in your working directory is:

git reset HEAD <file-name>

This tells Git to remove the file from the staging area but leaves your actual file untouched. For example, if you staged index.html by accident, running git reset HEAD index.html will unstage it, but all your edits to that file remain intact.

You can also use this command without specifying a file to unstage everything:

git reset

Just be careful—this won't lose any file content, but it might undo more than you intended if you had multiple files staged.

Unstaging part of a file's changes

Sometimes you only want to unstage certain parts of a file, not the whole thing. If you’ve used git add on a file and now realize you only meant to commit some of the changes, you can use:

git reset -p <file-name>

This opens an interactive prompt where Git shows you each "hunk" (chunk of changes) and asks whether you want to unstage it. It’s super useful when you're trying to split up changes into smaller, logical commits.

For example:

• You modified app.js and added the whole file to staging.
• But now you realize only half of those changes should go into the next commit.
• Run git reset -p app.js, and say "yes" to unstaging the hunks you don’t want in this commit.

What if I already committed and want to fix the last commit?

If you've already committed and realize you included something you shouldn’t have, you can "undo" the last commit while keeping your changes:

git reset --soft HEAD~1

This moves the commit back to the staging area. From there, you can remove the mistaken file with git reset HEAD <file> before committing again.

Alternatively, if you want to completely remove the file from both the staging area and the last commit history (but keep it in your working directory), you can use:

git reset HEAD~1 -- <file-name>

Then re-add only what you need before committing again.

Summary

• Use git reset HEAD <file> to unstage specific files.
• Use git reset -p to unstage parts of a file.
• Use git reset --soft or git reset to adjust recent commits.

Basically, git reset is your main tool here. It might feel a bit tricky at first, but once you get used to how it works, managing what gets staged becomes second nature.

The above is the detailed content of How do I remove a file from the Git staging area?. For more information, please follow other related articles on the PHP Chinese website!