Git And GitHub: How To Hard Reset Local And Remote Repository

Song of the Week

Introduction

Before we go over how to do this, let's go over when you should and should not do this.

Don't do a hard reset if you've already pushed the commits in question to a shared remote repository. If another developer pulls and starts basing their work on the commits that the reset removes from the commit history, you're going to create huge problems.

A hard reset can be done if you're the only one using the local and remote repository, or if the reset removes commits that have not yet been pushed to a shared remote. In this case, you're the only one affected by the hard reset, so it's relatively safe to do. Just make sure you want drop the commits in question before you do the reset.

Also, just as a quick reminder, git reset --hard <commit-hash> will move the HEAD pointer back to the commit hash that was given, the Stage Index and the Working Directory will be reset back to the way they were at that commit, and all commits after the commit that was given will be dropped from the commit history. This means that any uncommitted work in the Staging Index or Work Directory will be lost.

How to Hard Reset the Local Repository

To simplify the example, I created a repository with a README in it, and for each commit, I added a line that matches the commit message. So, after four commits I ended up with a README that looked like this:

To reset your local repository, first you need to know which commit you want to reset to, and what the hash is for that commit. One way to do this is to run git log.

Let's say that after looking through this commit history you wanted to reset to the "second commit". Then, you would write down or copy the commit hash for that commit and run:

git reset --hard <commit-hash>

Based on the example, that command would look like this:

After running the hard reset command, the Working Directory now looks like this:

You can see from git log and the Working Directory that we have rolled back to the second commit and dropped the third and fourth commits.

How to Hard Reset the Remote Repository

Performing a hard reset of the remote repository is quite easy. After you've reset the local repository, simply do a force push with the follow git command:

git push -f <remote> <branch-name>

In the example we used above, that git command would look like this:

Takeaways

• Only do a hard reset if you are the only using the remote repository, or if you haven't yet pushed the commits you're going to drop.
• Find the commit hash of the commit you want to reset to with git log.
• Perform the local hard reset by running git reset --hard <commit-hash>.
• To hard reset the remote repository, first hard reset the local and then run git push -f <remote> <branch-name>

References

Cover Image Reverting to Specifi Commit Based on Commit ID with Git - stackoverflow.com Resetting Remote to a Certain Commit - stackoverflow.com Git Reset - Atlassian.com Resetting, Checking Out, and Reverting - Atlassian.com