News for hackers. Stuff that matters.
Re:Linus Torvalds: 'I Do No Coding Any More' by aaomidi on Sunday July 05, 2020 @03:47PM (#23741344)
Until you use squash and merge. Suddenly commit messages become far less helpful.
Re:Linus Torvalds: 'I Do No Coding Any More' by nemetroid on Sunday July 05, 2020 @04:47PM (#23741819)
Yep, a good argument against squash and merge.
Re:Linus Torvalds: 'I Do No Coding Any More' by aaomidi on Sunday July 05, 2020 @07:57PM (#23743307)
I guess it's an argument for and against it at the same time.
Re:Linus Torvalds: 'I Do No Coding Any More' by mdtusz on Sunday July 05, 2020 @11:14PM (#23744347)
We had this argument recently at my workplace and dug into the pros and cons of both, ultimately settling or regular merges and no squash.

The only real argument for squash-merges is that history remains linear and visually "clean", but if you want to see a "clean" history of only the merge commits, you just can just use the `--merges` option on the command line.

Squash locally if you really want to or need to, but I'm a firm believer of disallowing it as the merge method for a changeset.

Re:Linus Torvalds: 'I Do No Coding Any More' by aaomidi on Monday July 06, 2020 @01:38AM (#23745028)
I have a less purist view on it personally. It doesn't really matter to me because I rather people commit more often, and if I really need history I can go check GitHub/etc.