如何恢复已删除的git项目

Question

I wanted to merge a git branch named gh-pages with the master branch, but instead I typed ph- and pressed the tab button for autocompleted. I tried that several times, and when I looked into the folder, nothing was there Only the .git folder and the Readme.md file are left.

I have checked the log by running git reflog , and I can still see all the commits I have done. Please how do I recover the files?

Answer 1

I do not see yet how you got there, as merging a branch that does not exist leads to an error message. Here is a typical scenario:

$ git init metest
Initialized empty Git repository in /tmp/metest/.git/
$ cd metest
$ echo "file1" >> file1
$ git add file1
$ git commit -m "File 1"
[master (root-commit) 5f56a1d] File1
 1 file changed, 1 insertion(+)
 create mode 100644 file1
$ git checkout -b some
Switched to a new branch 'some'
$ echo "file2" > file2
$ git add file2
$ git commit -m "File2"
[some 47af0d5] File2
 1 file changed, 1 insertion(+)
 create mode 100644 file2
$ git log # Shows 2 commits
$ git checkout master
Switched to branch 'master'
$ git log # Shows 1 commit
$ git merge foo- # Tab completion should show nothing
merge: foo- - not something we can merge

There may be a bug in the Git version you are using, or in one of the satellite tools.

Anyway, assuming your remote is pristine (you did not push the changes), you can:

• git checkout . to recover the files. This would work if git status was showing some local changes.
• git reset and its flavors, depending on your particular case (see help).
• Clone the remote into a new directory to see if the files are there.