Hacker News Reader

> others (including currently) where `rebase and merge` was the standard.

Isn't the usual standard "rebase && merge --no-ff?" Yielding a merge commit but lower branch interleaving in the logs? This is going to dump all the branch's commit into the mainline.

View on HN

Some projects (like Chromium) squash all of the contributor's commits into a single commit representing their entire local branch history (it was local, no one needs to see their "aw shit I broke the tests" commit), and then rebases that commit and lands it directly on top of master.

Github already supported that with the second merge method they introduced ("squash").

Reply on news.ycombinator.com