I started a git rebase in my repository a day ago and never finished it. I forgot about and did a lot of modifications while I was still in the rebase. Today I accidentally did a git rebase --abort without putting those modifications in a commit. Now it looks like all my modifications are gone. Is there any way to recover them?
My git reflog looks like this:
57d731c HEAD@{0}: rebase: aborting
d2d3738 HEAD@{1}: rebase -i (start): checkout david
57d731c HEAD@{2}: commit: My commit message
You can only recover if you have added the content even if you did not commit. But if you did not even added the changes to the staging are you cannot recover those changes unless you use IDE and the IDE has local history of your changes.
git start to track file once they are in the stage area and not while they are untracked.
The local history exists in all the majors IDEs.
git reflog couldn't help me, but luckily I sitll had the files open on VSC, so a bunch of Ctrl+Zs did the trick.
If you didn't commit those modifications during the rebase, they unfortunately will be irrevocably lost.
It's better to use git stash before git rebase. git stash pop can easily take you where you were.
you can checkout to the commit you want after doing a reflog.
git checkout 57d731c
git reflogand see if you can find your edited commits :)d2d3738it would restore the uncommited modifications I did during the rebase?git showorgit log -p(orgitk) to inspect the commit in question. If you didn't commit the changes though, chances are slim. I don't think Git will auto-stash them when aborting a rebase. Worth a try might also be checking for dangling blobs and trees which could contain the versions of your files you lost.