5 ms·

Have you come across `git rebase --update-refs`? This automatically moves your "intermediate" branches during a rebase and sounds like it could be useful in you

Have you come across `git rebase --update-refs`? This automatically moves your "intermediate" branches during a rebase and sounds like it could be useful in your situation.

jrochkind1 2y ago
I have not! I'll try to check it out, thanks! The git cli still scares me when I get off the familiar path. :(
dmurray 2y ago
There's also `git rebase --onto`, which effectively does the reverse - you tell git you've already rebased the part of this branch that overlapped with the "intermediate" branch, and it just needs to take care of the rest.
- Vinnl 2y ago
  Oh that sounds exactly what I need to simplify the workflow I described for the multi-PR use case. I'm going to try that out today, I just happen to have a use case for it ready to go :)
- jrochkind1 2y ago
  Wow, I knew of neither of these, thank you! I'll have to take some time to experiment with both and make sure I understand howt hey work and any pitfalls! I am definitely in the crowd that thinks git UX is pretty unintuitive and challenging, despite having used it for over a decade! These sound like great plumbing for a github-style web UI that actually facilitates multi-step sequence PR's though...