JIYIK CN >

We showed three ways to undo commits pushed from a remote repository in Git. To do this, we used the git reset, , revertand checkoutcommands.

When we use git reset, we also remove any traces of the unwanted commit from the repository history. But with git revert, both the original commit and the undo commit remain in the history.

If we use git checkout, we undo the changes in the new branch.

Use git resetthe command to undo the pushed commits

We created a undo_pushed_commits_localrepository and populated it with some healthy (good) commits.

mkdir undo_pushed_commits_local
git init

Then
add/modify files.

git add --all
git commit -m "Make healthy commit"

Add/modify more files.

git add -all
git commit -m "Make another healthy commit"

We will now push these commits to the repository on GitHub undo-pushed-commits-remote.

git remote add undo-remote git@github.com:danielturidandy/undo-pushed-commits-remote.git

git push undo-remote master

Our remote repository now has two commits.

Now, let's make a bad commit.

echo "This is a bad addition" >> file1.txt
echo "This is a bad addition" >> file2.txt
git add -all
git commit -m "Make a bad commit"

We push this commit to the remote repository.

git push undo-remote

Our remote has the wrong commit:

We are now 重置at the last good commit in our local repository. We use --hardthe -p option to remove any traces of the bad commit from our commit history.

git log
git reset --hard  <SHA of the last good commit>

We use the -f option 推送to force push the local repository to the remote repository.

git push -f undo-remote

This method is best suited for private repositories or repositories for small teams.

Large teams may run into problems if some developers pull remote to local environment after pushing bad commits before we reset to a good state. They have no commit history with 纠正bad commits for their repositories.

Use git revertthe command to undo the pushed commits

Here we push four wrong commits to the remote repository.

We can use revertto undo a single bad commit or a series of bad commits.

revertMake a new commit that reverses the unwanted commit. Both the original commit and the reversed commit are preserved in the repository history.

revertTo undo a single pushed commit, use

git revert <SHA of the commit we want to revert>

We will now push this change to the remote repository. Remember to use the -f flag to ensure there are no conflicts.

git push -f undo-remote

Our remote repository now has a new commit that reverses the bad commit.

revertTo undo a series of pushed commits, use

git revert <SHA of the oldest commit to revert>..<SHA of the newest commit to revert>

This will revert all commits in the provided range (excluding the oldest commit, but this may also depend on the version/platform you are using.)

We will now push the changes to the remote using the -f flag.

git push -f undo-remote

This approach is great for public repositories with large teams. Since both bad commits and undo commits are kept in the history, developers can update their local repositories with all bad pushes/reverts.

Use git checkoutthe command to undo the pushed commits

This technique is a quick hack that creates a new branch without the bad commits. It's great for small codebases and if you're pressed for time.

We first checkoutget to the last good commit.

git checkout <SHA of last known good commit>

We then reach the detached HEAD state at the last known good commit in the repository's history.

We now fork a new branch from this state.

git checkout -b branch_without_badcommits

We then push it to the remote into a new branch.

git push -f undo-remote branch_without_badcommits

The remote repository now has a new branch without any bad commits.