Stop the panic and inspect the repo

If your working tree looks like a crime scene and you are not sure which files to keep, breathe and run git status. This shows modified staged and untracked files and prevents deleting something that you actually meant to keep. Treat this command as your safety net and your therapist.

Check repository status

Run the single line check to see what is going on. It takes two seconds and saves you from heroic mistakes.

git status

Discard changes in a tracked file

If a tracked file has local edits that you want to throw away and pretend they never happened use git restore. This replaces the working copy with the version from your last commit so the file matches history again.

git restore path/to/file

Keep in mind this overwrites local edits. If you might regret this later stash first or make a quick patch branch.

Unstage a change without losing edits

If you added something to the index by mistake use restore to move it out of staging while keeping the working copy intact. This is the gentle undo move.

git restore --staged path/to/file

Remove untracked files and folders

When build artifacts or forgotten temp files clutter the tree use git clean to nuke them. Always preview first unless you enjoy surprises.

• Preview what would be removed with git clean -n
• Remove files with git clean -f
• Remove directories as well with git clean -fd

Do not run these commands from the wrong directory if you value your free time.

Revert all tracked changes and reset the tree

If you want the working tree and index to match the last commit exactly use reset hard. This is the nuclear option. It will discard all local modifications for tracked files so double check git status first.

git reset --hard

Stash changes for a later comeback

When you want to pause work and not delete it stash is your friend. It shelves changes and lets you switch context without creating a half baked commit history.

git stash push -m 'wip note'
# apply and remove from stash
git stash pop
# list stashed entries
git stash list

When to stash versus reset

• Stash when you might come back to the work
• Reset when you are sure those edits are trash and you want a clean slate
• Clean when the clutter is untracked files and not code you care about

Quick command cheat sheet

• git status to inspect the scene
• git restore path/to/file to discard edits to a tracked file
• git restore --staged path/to/file to unstage without losing edits
• git clean -n to preview untracked removals
• git clean -f or git clean -fd to remove untracked files or folders
• git reset --hard to reset working tree and index to the last commit
• git stash push -m 'note' to shelve work for later

Recap

This short guide covered safe ways to inspect a repo discard single tracked file edits unstage staged changes clean away untracked clutter reset the whole working tree and stash work for later. Use git status as your first stop and pick the command that matches your bravery level. If in doubt stash and live to regret less later.