[tsimionescu]

... or git merge / git pull (but not git rebase) ...

[rjmunro]

How do you loose files with git merge / git pull?

[witcher01]

merge and pull update the reflog just like rebase does, so both can be undone!