和Git(Magit,Emacs)一起回到过去

时间:2015-02-20 10:16:30

标签: git emacs magit

Git状态:

Local:    master ~/Dropbox/MyProject/
Remote:   master @ origin (https://github.com/.../MyProject.git)
Head:     fe73b07 updated gitignore

Pending commits:
* updated gitignore
* test
* trying to go with a flat structure
* * testing.py:

这就是我的简历看起来像

fe73b07 * [HEAD] [origin/master] [origin/flat] [new] [master] [flat] updated gitignore
974e70d * test
ab333e6 * trying to go with a flat structure
b901d75 * * testing.py:

我感到很紧张;我只想回到b901d75并忘记发生的一切。

但每当我检查出来(checkout)时,我都不允许提交/推送。

git硬重置后,我遇到了这种情况:

Local:    master ~/Dropbox/MyProject/
Remote:   master @ origin (https://github.com/../MyProject.git)
Head:     dec79d3 updated gitignore

Pending commits:
* updated gitignore
* test
* trying to go with a flat structure
* * testing.py:

Unpulled commits:
fe73b07 updated gitignore
974e70d test
ab333e6 trying to go with a flat structure

Unpushed commits:
dec79d3 updated gitignore

0 个答案:

没有答案