Locate the branch state before an unwanted rebase.
Section: Rebase Conflicts and Recovery
Find pre-rebase state in reflog
bash
bash
git reflog | head -20Explanation
Reflog is usually the fastest recovery path when a rebase result is not what you wanted.
Learn the surrounding workflow
Compare similar commands or jump into common fixes when this command is part of a bigger troubleshooting path.
Related commands
Same sheet · prioritizing Rebase Conflicts and Recovery
Enable rerere globally
Reuse recorded conflict resolutions in future rebases and merges.
Take ours side for a conflicted file
Resolve one conflicted path using the current branch side.
Take theirs side for a conflicted file
Resolve one conflicted path using the incoming side.