I git aborted rebase and lost all my work

Question

I aborted rebase and lost all the work, I had not commited anything else that what I can recover from the repo. That is, I made a commit yesterday and pushed to a branch, kept on working until today without commiting any new work, and aborted the rebase.

I tried git reflog as suggested in this answer and there is HEAD@{0}: rebase: updating HEAD and there are HEAD@{1}: ... HEAD@{7}:

Since I hadn't commited any work, did I loose it permanently? Also, the branch in which I was switched when aborting rebase

Is there a way to got to right before the abort rebase?

Thank you

VonC_6309 · Answer

To summarize:

A git rebase starts with resetting the current branch is to , or if the --onto option was supplied. This has the exact same effect as git reset --hard (or ).
ORIG_HEAD is set to point at the tip of the branch before the reset.
any private file would therefore be gone, which is why git config --global rebase.autostash true should always be set.
any file added to the index (but not committed), might still be present in Git internal database.
Linux Mint might have saved something in TimeShift
If not, don't forget to check the JetBrain Android Studio local history.: you might be able to restore deleted files (this is for PyCharm, but might also apply to android Studio).

I git aborted rebase and lost all my work

1 Answers