git - 如何从 'detached head state' 恢复提交？

Question

我检查了另一个有更新的分支，然后做了一些更改，切换回主 git，现在更改消失了!我可以取回它们吗？终端基本上是:

$ git commit
[detached HEAD 7c09e17] Fixed some stuff
  files changed, insertions(+), deletions(-)
$ git push master
fatal: 'master' does not appear to be a git repository
fatal: The remote end hung up unexpectedly
$ git checkout master
Previous HEAD position was 7c09e17... Fixed some stuff
Switched to branch 'master'
$ git merge theother/directory

Answer 1

假设你还在 master 上:

git merge 7c09e17

应该够了。如果您观察终端，git 通常很擅长告诉您提交 ID。