Restore git files deleted after git merge –abort

by

What have you tried with git fsck ?

see this SO question : Recover files that were added to the index but then removed by a git reset

The general answer is : the sequence of instructions you typed has removed the file from tracking (and from the disk), there is no guarantee that the content of your file can be retrieved.

However, git has a lot of safety mechanism, and one of them is : if some data is entered somewhere in the repo, it will not be deleted before two weeks.

(git has a garbage collection mechanism, see git help gc)

If you did indeed run git add test.txt at some point, and this action was recent enough, there should still be some trace of the content of the file stored within git :

git fsck --full --unreachable --no-reflog

in git parlance, a file is a blob :

git fsck --full --unreachable --no-reflog | grep blob

This should give you a list of internal git hashes :

unreachable blob 08bf360988858a012dab3af4e0b0ea5f370a2ae8
unreachable blob 21bf7ea93f9f9cc2b3ecbed0e5ed4fa45c75eb89
unreachable blob 08c12ef37075732cf4645269ab5687ba6ba68943
...

note that git add file.txt stores the file’s content, not the file’s name …

If you remember a specific string in your file, you can try to narrow your research by using git grep <string> <hash> :

$ git fsck --full --unreachable --no-reflog | grep blob | awk '{ print $3 }' > list.txt
$ cat list.txt | while read blob; do
  if git grep -q "string" $blob; then
    echo $blob
  fi
done

You can then view the whole content of a blob using :

git show $blob

and hopefully find back the file you were looking for.

More Related Contents:

  1. Merge, update, and pull Git branches without using checkouts
  2. Is it possible to pull just one file in Git?
  3. Merge, update, and pull Git branches without using checkouts
  4. What is the best (and safest) way to merge a Git branch into master?
  5. Can “git pull” automatically stash and pop pending changes?
  6. Is there a “theirs” version of “git merge -s ours”?
  7. Re-doing a reverted merge in Git
  8. When would you use the different git merge strategies?
  9. What’s the difference between ‘git merge’ and ‘git rebase’?
  10. What does FETCH_HEAD in Git mean?
  11. Difference between git pull and git pull –rebase
  12. Message “Support for password authentication was removed. Please use a personal access token instead.”
  13. Why does git say “Pull is not possible because you have unmerged files”?
  14. I ran into a merge conflict. How do I abort the merge?
  15. Update Git submodule to latest commit on origin
  16. What’s the simplest way to list conflicted files in Git?
  17. There is no tracking information for the current branch
  18. Git push only for bare repositories?
  19. Git merge hotfix branch into feature branch
  20. Get changes from master into branch in Git
  21. Find unmerged Git branches?
  22. error: Your local changes to the following files would be overwritten by checkout
  23. What is the difference between git pull and git fetch + git rebase?
  24. Tell git not to merge binary files but to choose
  25. How to keep a branch synchronized/updated with master?
  26. How to see commits that were merged in to a merge commit?
  27. Git: Merge a Commit into a different Branch
  28. Telling if a Git commit is a Merge/Revert commit
  29. How to quit (not abort) a Git merge in progress keeping the changes uncommitted?
  30. The following untracked working tree files would be overwritten by merge, but I don’t care

Leave a Comment