GitHub转到上一个提交

Question

I'm collaborating with a friend on a website and wanted to update something, but now we realize that we don't want the update. So I found the commit we need, and typed

git reset --hard 0033e84…dffa6

because I found it on google, and this just replaced the changed file from back then. We want every file from back then, not just one. Then again I typed

git revert 0033e84…dffa6

and now somehow the "Last update" on the files changed, but the content is still the same new we don't want. We just want to go back. Why is that so confusing?

I only found those two command to go back, and it didn't help. The problem now is that the old commits are overwritten and its just messy.

What's the correct command to just go back in time with all the files and stuff? As it was before, not just some files.

The possible dublicate does not work in case of my problem. Whenever I want to go back, it just changes the commited FILE, not FILES in between.

Answer 1

Say, your branch name is b1 . Then try:

$ git checkout b1

# revert the commits changes
$ git revert <from-commit-hash>..<to-commit-hash>

Answer 2

If you typed

$ git reset --hard 0033e84…dffa6

all your file change between HEAD and this commit will back to this commit, and commit record will be discarded.

If you typed

$ git revert 0033e84…dffa6

a new commit will be created to revert the change in commit 0033e84…dffa6

As you described,I think the first command is what you need, only the files add in repository will be back, only the files change between HEAD and this commit will change.

Answer 3

Now what I did is a new branch, then I

git reset --hard 1b2d6cb9857420892b120fcc67f528ed68435599

And it told me "HEAD is now at 1b2d6cb Commit Message " Now I was excited, because Terminal told me there is a folder, that belonged to the old version we wanted, called panel

Then I checked in my Finder, there was no folder called panel

I checked again in the Terminal via ls, and its gone again! I feel like I am using the computer for the first time. What is going on. Here a screenshot:

Terminal Screenshot