获取之前在git仓库上删除的提交

Question

Yesterday when I was at work, I was working on my project that i have on my home computer. The problem was when I tried cloning the repo it eclipse would crash. So instead I downloaded it manually and initialized the repo and then force pushed to my home computer. This deleted all the history and files in on the repo. I did some googling and tried reverting the commit but it the force push erased the commit history so I can only go back to the force push commit.

I have a computer at home which hasn't pulled the updates since this mistake and I was able to get its commit SHA. I used that on the web and found the last version its still there but I can't pull that commit because it got "deleted" and won't show in the repos history. Is there a way I can use the SHA from the last good commit and make that the master branch restoring my history?

Answer 1

When changing the HEAD (the working position in the git repository), it tracks your history in the reflog . Executing git reflog in the command line will show your complete history. You can read more about it on git-scm.com

When you have the desired commit SHA, you can do a git checkout with it. Executing git checkout [SHA1] will take you to the desired position in the git history. From there, you can make a new branch from it by running git checkout -b "new_branchname" .

If you want to set your current branch to the commit, you can run git reset --hard [SHA1] . This would reset the current branch, but the previous state can however be found in the reflog.

Answer 2

I do NOT recommend doing this as general practice BUT...You should be able to force push from the other computer, thus resetting the repo to its former state. Providing you don't want to keep anything you did while making a giant mess of your git repo yesterday.

Answer 3

Since you know the right version you want to recover, it will make things easier.

In your local repo, use below commands:

git reset --hard <commit sha value>
git push -f

Note: if you execute the commands in the local not initialized (not cloned from remote), you should fetch first by git fetch --all , and then execute the two commands .

Now the version will go back to the latest as you need both locally and remotely.