Git: has the branch lost its history?

Question

Something strange happened - my development branch lost its entire history until the last commit. Can anyone suggest a reason?

The last thing I did was to establish that I had forked the GitX sibling and started using it (primarily to view the story, but also tried to do it when merging). But before the development looked from the master and went in parallel, the 'feature-shape-fill' branch was merged into development two times. I also made git stash in development.

Right now, git log for development is just showing the last commit. Doesn't say anything like that

* I'm already afraid of GitX (official and this fork), because something strange happened in recent weeks, the binary .fla file was not saved over the last evening in several commits. All text files were fine, but this binary was like 4 commits behind. Other working directories were not updated at all when switching between branches (I worked in the console, and git did not say a single error, this was normal for him). Donno, if this is something to do with GITX?

upd: Looks like the same problem mentioned here http://groups.google.com/group/gitx/browse_thread/thread/71a0f759d115fee5 Here is what I got:

$ 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

They don't seem to be lost, but how do I get my story back?

Answer 1

, develop , .

, master, :

git rebase master develop

: .git, , , .

, develop2 master develop :

git checkout -b develop2 master
git merge develop

, ! , .git, !

Answer 2

, :

git reflog show develop

, / SHA ( , , @{1}), , . :

git branch test 7f6c394

, , , : ed44a2c, 67d08b3, 505479c

. , , , , .

Answer 3

: SHA - , , . , EOL, , . ( , .) , , reflog , . , , :

6d79889 HEAD@{24}: checkout: moving from online-payment-processing to gift-certificates
3da6ec3 HEAD@{25}: commit: fix computation of when to skip processing for special orders

In principle, the commit passed the test of another branch. (In my case, the branch online-payment-processingwas the only one in limbo, and the “switch from” message assured me that the previous commit was in my branch.) I knew that the commit in HEAD was the one that was confused (as opposed to another story in the story ), so I issued the command:

git rebase 3da6ec3 online-payment-processing

and ... poof ... it is fixed (after some resolution of the conflict) and the history of my branch is restored.