3 ms·
> 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
by masklinn 10y ago
> 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.
- phasmantistes 10y agoSome 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.
- masklinn 10y agoGithub already supported that with the second merge method they introduced ("squash").