发生了一些奇怪的事情——我的开发分支失去了所有历史记录,直到最后一次提交。有人能提出原因吗?
我最近所做的事情是安装了那个分叉的brotherbard GitX,并开始使用它(主要用于查看历史记录,但也尝试进行合并)。但在此之前,develop分支是从master开始并平行进行的,“feature-shape-fill”分支已经两次合并到develop中。我还在develop中使用了git stash。
现在,develop分支的git log只显示了最后一次提交。没有说什么“脱离”之类的话。
* 我已经对GitX(官方版本和这个分叉版本)感到担忧,因为在过去几周中,也发生了一些奇怪的事情——二进制的.fla文件在过去的几个提交中都没有被保存。所有文本文件都没问题,但那个二进制文件就像落后了4个提交一样。在切换分支时,其他工作目录根本没有更新(我是在控制台中工作的,而git并没有报告任何错误,对它来说一切都很好)。不知道这是否与gitx有关?
更新: 看起来这里提到的问题与http://groups.google.com/group/gitx/browse_thread/thread/71a0f759d115fee5相同。 这是我得到的:
$ git reflog
157cfca HEAD@{0}: checkout: moving from feature-shape-fill to develop
46a6163 HEAD@{1}: checkout: moving from develop to feature-shape-fill
157cfca HEAD@{2}: commit: Rotated drag tip
7f6c394 HEAD@{3}: commit: TextShapesCanvas is working,
4765eed HEAD@{4}: merge feature-shape-fill: Merge made by recursive.
ed44a2c HEAD@{5}: checkout: moving from feature-shape-fill to develop
46a6163 HEAD@{6}: commit: More tight packaging (thnx to TextLineMetrics),
59b6d2d HEAD@{7}: checkout: moving from develop to feature-shape-fill
ed44a2c HEAD@{8}: merge feature-shape-fill: Merge made by recursive.
67d08b3 HEAD@{9}: commit: Basic grid functionality, need to add text shapes and fix resize-generation
505479c HEAD@{10}: checkout: moving from feature-shape-fill to develop
59b6d2d HEAD@{11}: commit (amend): Simple retrovirus non-optomized algorithm
5ec1b70 HEAD@{12}: commit: Simple retrovirus non-optomized algorithm
b9eaf18 HEAD@{13}: commit: The most ugly suitable version of fill algorithm
757f1b7 HEAD@{14}: checkout: moving from feature-shape-fill-predefined to feature-shape-fill
757f1b7 HEAD@{15}: checkout: moving from feature-shape-fill to feature-shape-fill-predefined
757f1b7 HEAD@{16}: checkout: moving from feature-shape-fill-auto to feature-shape-fill
b8e284f HEAD@{17}: commit: Auto fill first steps
757f1b7 HEAD@{18}: checkout: moving from feature-shape-fill to feature-shape-fill-auto
757f1b7 HEAD@{19}: commit: Test document created, components::TextShape base draft
505479c HEAD@{20}: checkout: moving from develop to feature-shape-fill
505479c HEAD@{21}: checkout: moving from master to develop
看起来它们并没有丢失,但如何找回我的历史记录?