this post was submitted on 07 Mar 2025
10 points (100.0% liked)
Programming
426 readers
6 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
@QuazarOmega I always do
git branch tmp
before doing a rebase, to have a backup. Also useful for checking nothing got lost in conflict resolution. #gitThat's not what I need, I can just abort the rebase in this case and I'd get back my branch as it was before I started, but I explicitly want to go to a state in the middle so not as to lose the modifications that I did intend to do.
Aside from that, I also do that, have seen what hell can be like in rebasing, so knowing where you started is always valuable, I agree
@QuazarOmega I don't know for sure, sorry. Like someone said on that link, the reflog should have a record, but you'll need to either abort the rebase and then pick out the right commit, or forcibly kill git's tracking of the rebase operation. When I know a rebase is going to be long and complicated, I'll break it down into multiple rebases.