8

Let's say I want to undo all changes introduced by previous commits.

As far as I understand, git reset --hard <specified commit> will remove all commits up until the specified commit, and undo all changes.
On the other hand git checkout <specified commit> will change my directory to reflect the specified commit.

So if I git reset after git checkout will it have the same result as git reset --hard?

Alternatively, if I simply git commit after git checkout, will the newly created commit overwrite the existing commits?

Atlas23250
  • 157
  • 2
  • 7

2 Answers2

9

In a nutshell, git commits are a tree, and branches are just pointers to some commits.

git checkout <specified commit> does not move the branch pointer. When you do this, you are in detached head state. You will see this message, which is pretty self-explanatory:

You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example:

git checkout -b new_branch_name

Another difference is that git checkout is safer, because it will not reject your changes in the working tree, and you will not lose any commits with it¹.

git reset --hard <specified commit>, on the other hand, will move your current branch to the specified commit and you will lose all the changes in your working tree. Additionally, if you're moving to some older commit, and the newer commits are not in some other branch, you will lose these newer commits too. It is not a safe operation and don't do this unless you really understand what you're doing.

See also these great answers for information about how to undo a git commit.

You might also benefit from using a GUI tool like SourceTree.

¹ - well, unless you're already in detached head state on some dangling commit, but normally you shouldn't worry.

Community
  • 1
  • 1
mik01aj
  • 11,150
  • 14
  • 71
  • 113
3

So if I git reset after git checkout will it have the same result as git reset --hard?

No. git reset (with --hard, or any other option) resets the HEAD, so you always lose commits, unless you are not specifying any commit to reset to.

After you do git checkout <commit> you are in a detached HEAD state, so git reset is a bit pointless because you won't be resetting any branch.

Alternatively, if I simply git commit after git checkout, will the newly created commit overwrite the existing commits?

No. Because again, you are in a detached HEAD state. You are essentially creating commits in a ghost branch.

The safest thing is to always create a new branch with git checkout -b and once you are sure you want to reset your other branch, then do git reset --hard.

FelipeC
  • 7,946
  • 4
  • 40
  • 35