Reset

Moves the pointer (HEAD/current state) back to an earlier commit, undoing changes made after that point. It can also update your working files and the list of staged changes, depending on how you use it.

when to use:

1. You’re working locally and want to clean up your commit history before pushing.
2. To undo commits that haven't been shared with others yet.

git reset [--soft | --mixed | --hard] <commit>

--𝒔𝒐𝒇𝒕: Resets HEAD to the specified commit but keeps your staged changes.

--𝒎𝒊𝒙𝒆𝒅 (default): Resets HEAD and unstages changes, but leaves the working directory intact.

--𝒉𝒂𝒓𝒅: Everything is wiped, including staged and working directory changes. Use with caution!

Revert

Creates a new commit that undoes the effects of a previous commit, preserving the history of changes.

When to use:

1. You need to undo a commit but have already pushed it to a shared branch.
2. You want to preserve the integrity of your commit history in a team setting.

git revert <commit>

💡 Pro Tip It is possible to revert multiple commits by specifying range:

git revert <start-commit >..< end-commit >

It is not enough? Do you need to revert multiple commits but skip some?That's where 𝑪𝒉𝒆𝒓𝒓𝒚-𝑷𝒊𝒄𝒌 helps.

Cherry-Pick

When to use:

1. You want to selectively apply multiple commits from one branch to another without bringing in all the other changes from that branch.
2. Great for bringing over bug fixes or small features from other branches without disrupting your current work.

git cherry - pick <commit-hash1> <commit-hash2> <commit-hash3>

Amend

Modifies the most recent commit, either by changing the commit message or including additional changes.

1. To fix a typo or improve a commit message.
2. You forgot to add a file and want to include it in the previous commit.
3. Even to change commit author user name for specific commit.

git commit --amend

💡 Pro Tip

After amending, use git push --force-with-lease instead of git push --force to safely force-push amended commits. It avoids overwriting commits that others might have made in the meantime.