Git Reset

Mistakes are a part of every development process, but with Git, you can efficiently undo changes using commands like git reset. Whether you need to unstage files, roll back commits, or rewrite history, git reset is a powerful tool to master.

In this guide, we’ll explore how git reset works, its different modes, and when to use it.

For more Git tutorials, visit The Coding College, where we simplify coding concepts to boost your productivity.

What is git reset?

git reset is a Git command that lets you undo changes by moving the HEAD pointer to a specified commit. Depending on the mode you use, it can:

  1. Unstage changes.
  2. Remove changes from the working directory.
  3. Rewrite commit history.

Modes of git reset

1. Soft Reset (--soft)

Moves the HEAD pointer to the specified commit but keeps changes staged in the index.

When to Use:

  • To undo a commit but keep changes staged for re-commit.

Command:

git reset --soft <commit-hash>

2. Mixed Reset (--mixed) (Default Mode)

Moves the HEAD pointer and unstages changes, but leaves the working directory untouched.

When to Use:

  • To undo a commit and unstage changes for editing.

Command:

git reset --mixed <commit-hash>

3. Hard Reset (--hard)

Moves the HEAD pointer, unstages changes, and discards all changes in the working directory.

When to Use:

  • To completely undo commits and changes in your working directory.

Command:

git reset --hard <commit-hash>

How to Use git reset

Step 1: View Commit History

Identify the commit you want to reset to using:

git log --oneline

Example output:

f3a1b0d Update README.md  
a2b9c7d Add feature X  
c1d2e3f Initial commit

Copy the hash of the commit to reset to (e.g., a2b9c7d).

Step 2: Choose the Reset Mode

Decide how much of the changes you want to keep:

  • Use --soft to keep changes staged.
  • Use --mixed to unstage changes but keep them in the working directory.
  • Use --hard to discard changes completely.

Example:

git reset --mixed a2b9c7d

Step 3: Verify the Reset

After the reset, check the status of your repository:

git status

Scenarios for Using git reset

1. Undoing the Last Commit

If you mistakenly committed changes, undo the commit while keeping the changes:

git reset --soft HEAD~1

2. Unstage Changes

If you accidentally staged changes with git add, unstage them with:

git reset HEAD <file>

3. Roll Back to a Previous Commit

To revert your branch to a specific commit and discard all subsequent changes:

git reset --hard <commit-hash>

Risks of git reset

  • Data Loss: Using --hard will permanently delete changes in your working directory.
  • Impact on Shared Repositories: Resetting commits in a shared branch can cause conflicts for collaborators.

Best Practices for Using git reset

  1. Use --soft or --mixed for Safer Changes: Avoid data loss by keeping your changes intact.
  2. Avoid --hard on Shared Branches: Use it only on local branches to prevent disrupting others.
  3. Create Backups: Before using --hard, back up important changes with git stash.

Alternatives to git reset

  • git revert: Use when you need to undo a commit without rewriting history.
  • git checkout or git restore: Use to discard changes in the working directory without affecting commits.

Conclusion

Understanding git reset is essential for managing and undoing changes in Git. By mastering its different modes, you can efficiently fix mistakes and maintain control over your repository.

Leave a Comment