14
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
this post was submitted on 07 Mar 2025
14 points (93.8% liked)
Programming
18728 readers
542 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
If I'm understanding you correctly, you can create a branch to mark where you are
git branch tmp
then abort the rebase. Switch totmp
get the history like you wanted, then switch back. Finally do agit rebase -i
again, but immediatelygit reset --hard tmp
. Now you have the resolved commits you want, and can delete any you don't want to do again withgit --edit-todo
.Maybe.
Hmm, that sounds like it could be what I'm looking for, had never consider you could branch while in the middle of a rebase, nice!