What is the difference between git reset --soft, --mixed, and --hard?

'git reset --soft HEAD~1' undoes the last commit but keeps changes staged in the index. 'git reset --mixed HEAD~1' (the default) undoes the commit and unstages changes, keeping them in your working directory. 'git reset --hard HEAD~1' permanently destroys both the commit and all file changes.

How does Git Reflog recover lost commits or deleted branches?

Git Reflog ('git reflog') logs every reference update (commits, checkouts, rebases, resets) in your local repository for up to 90 days. Even if a commit was reset or a branch deleted, you can inspect the reflog and checkout HEAD@{N} to rescue your code.

How do I remove a sensitive .env file from Git without deleting it locally?

Run 'git rm --cached .env' followed by adding '.env' to your .gitignore file and committing the change. This removes the file from Git tracking while preserving the local copy on your hard drive.

Is it safe to force push (git push --force) to shared branches?

No. Force pushing rewrites commit history on the remote server and can overwrite work committed by teammates. Use 'git push --force-with-lease' instead, which verifies no remote commits will be inadvertently clobbered.

Git Scenario Solver & Undo Assistant (Cheat Sheet)

Understanding the Git Architecture: Working Directory, Staging, and History

Git's internal architecture is structured around three primary trees: the Working Directory (your local files on disk), the Staging Area / Index (the snapshot prepared for the next commit), and the Git Repository (HEAD) (the immutable commit graph).

Mastering Git recovery requires understanding how commands like git reset, git restore, and git reflog transition data between these three tiers.

Comparison: git reset vs. git revert vs. git restore

Command	Rewrites History?	Safety Level	When to Use
git reset --soft	Yes (Local HEAD)	🟢 Safe	Undoing local unpushed commits to re-stage or fix code.
git revert <hash>	No (Creates inverse commit)	🟢 Safe	Reversing buggy commits that have already been pushed to public/shared branches.
git restore --staged	No	🟢 Safe	Unstaging files accidentally added with `git add .`.
git reset --hard	Yes	🔴 Destructive	Completely nuking uncommitted work and resetting to a known clean commit.

Frequently Asked Questions

How long does Git Reflog retain deleted history?

By default, Git preserves reachable reflog entries for 90 days and unreachable entries for 30 days before the internal git gc garbage collector prunes unreferenced objects.

What is git push --force-with-lease?

--force-with-lease is a safer alternative to raw --force. It checks that the remote branch has not received any new commits from teammates before overwriting history, preventing accidental code loss.