this post was submitted on 07 Mar 2025
4 points (100.0% liked)
Programming
18918 readers
325 users here now
Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!
Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.
Hope you enjoy the instance!
Rules
Rules
- Follow the programming.dev instance rules
- Keep content related to programming in some way
- If you're posting long videos try to add in some form of tldr for those who don't want to watch videos
Wormhole
Follow the wormhole through a path of communities !webdev@programming.dev
founded 2 years ago
MODERATORS
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
Whatever you do, familiarize yourself with
git reflog
. It contains all the commits, regardless of your current branch state. Even ones you might think you lost. (For about two weeks until it cleans itself up.)In your shoes, I usually abort the rebase and start a new branch and
cherry-pick
the commits I need.It takes awhile, but it's reliable.
Source: In my overconfidence, I screw up my local git state pretty often.