如何还原由git pull rebase删除的文件

Question

something quite tragic happened to all my files in my project after I did a git pull rebase . I tried to follow the tips in this thread:

Git pull deleted uncommitted changes

especially the second solution and I have been trying this:

grep -rin string_in_missing_file .git/

I see results in the terminal like this:

.git//rebase-apply/0002:9609:+const ExplainSection = styled.div`
.git//rebase-apply/0002:9614:+const SectionNumber = styled.div`
.git//rebase-apply/0002:9621:+const SectionImage = styled.div`
.git//rebase-apply/0002:9626:+const SectionText = styled.div`

It seems that info about my files are still floating around somewhere, but I have no idea how to restore them, or if it is even still possible.

Please help me out here :(

Answer 1

Check git reflog so you can see where HEAD has been recently. That way you could go as far as to get the branch reset to where it was before. As long as those files where committed, you won't lose them that easily.