Hacker News new | ask | show | jobs
by kazinator 2324 days ago
Squashing isn't rebasing, period.

The connection between the two is that git has a script called git rebase, which has an interactive mode, and that can squash commits.

git merge has squash functionality also (git merge --squash).