Re:Fortunately, I don't squash my commits
by MaxBarraclough on Monday October 05, 2020 @12:27PM
(#24689203)
Perhaps we could 'have it all' if git introduced a way of bundling commits, a bit like code-folding in an IDE. The bundles could be expanded when you need fine-grain detail of development history, but by default would be unexpanded and would behave like a single big commit, avoiding the issue of always seeing overwhelming detail.
Re:Fortunately, I don't squash my commits
by stormbrew on Monday October 05, 2020 @01:07PM
(#24689643)
git has that, it's called a merge commit. You can use `git log --first-parent` to see them unexpanded and then find what you want to expand.
A lot of higher level tools don't expose this functionality but it's not like it's not there.
Re:Fortunately, I don't squash my commits
by cutemonster on Tuesday October 06, 2020 @12:47AM
(#24694776)
Is there any high level tool that does expose that functionality?
Re:Fortunately, I don't squash my commits
by couchand on Monday October 05, 2020 @12:19PM
(#24689115)
Maybe... sure that's fewer commits to cherry pick. But when some reconciliation is needed to make a patch apply to different version branches, it's sure a whole lot easier to manage if the commits are small.
The story told in the article mainly shows to keep your PR focused. You can squash as long as you don't do 2-week-long 37-commits branches.