logoalt Hacker News

the_gipsytoday at 10:30 AM1 replyview on HN

I usually just `git rebase origin/main -i` after the base branch has been merged there, and this means I need to explicitly drop the merged commits, but I can inspect what's happening.


Replies

Xophmeistertoday at 2:15 PM

Yeah, I do this too: The `--onto` solution feels a bit too magical at times and an interactive rebase is pretty clear about what's happening.

show 1 reply