git - 如何在 git 硬重置后恢复上次提交？

Question

我可以在硬重置后恢复以下提交吗？

步骤:

1) $ (master) // ....made a bunch of changes to files thinking I was working on a branch
2) $ git checkout -b 001-branch  // copy changes to a branch to work with
3) $ (001-branch) // make some more changes to files
4) $ (001-branch) git commit -a -m 'added and changed stuff'
// at this point I was just going to pull force master to latest then rebase my 001-branch off of original master (not the stuff I had modified)
5) $ (001-branch) git checkout master
6) $ (master) git reset --hard HEAD
7) $ (master) git pull
8) $ (master) git checkout 001-branch // go back to my branch and rebase my changes
9) $ (001-branch) // oops...my changes were all kiboshed and I don't see the commit I did per git lg

有什么办法可以解决这个问题来恢复我的更改？

Answer 1

要查看对 001-branch 所做的所有更改，您可以执行 git reflog 001-branch，但是，您认为您在 001-branch 中所做的很可能是您在另一个分支中所做的，所以您可能需要使用 git reflog 查看所有更改。