logoalt Hacker News

rkomornyesterday at 10:02 AM3 repliesview on HN

Isn't your tale more about squashing than rebasing?


Replies

OJFordyesterday at 10:39 AM

Any subsequent commits and the branch are inherently rebased on the squashed commit.

Rebasing is kind of a short hand for cherry-picking, fixing up, rewording, squashing, dropping, etc. because these things don't make sense in isolation.

show 1 reply
bawolffyesterday at 10:29 AM

Personally i squash using git rebase -i