Re:Fortunately, I don't squash my commits
by maccard on Monday October 05, 2020 @08:00AM
(#24686870)
That's much better than looking at a file in a 300 file commit and seeing "merged from XXXX" with no information as to why that one line was changed. I'd much rather spend 30 seconds parsing through the 10 yak shaving commits than have to go trawling through old commits on a file to find the most likely owner of it to ping on slack.
[ Parent
| on HN ]
Re:Fortunately, I don't squash my commits
by saagarjha on Monday October 05, 2020 @11:51AM
(#24688838)
You’re creating a false dichotomy. When people say “squash your commits”, the don’t mean “squash your entire repo into one commit”, they mean “get rid of you ‘typo’, ‘typo fix’ commits”. Your commits should still be small and self-contained.
Re:Fortunately, I don't squash my commits
by maccard on Monday October 05, 2020 @01:33PM
(#24689931)
Actually I think you're creating a false dichotomy. How many people are commiting dozens of "typo/fix build" commits and then squashing just those? In reality people are squashing the iteration process of "add an X, add a Y, remove the X because it didn't work, and add a Z instead of an X and Y" into "Add a Z"
If you're simply talking about removing "fix typo" commits, then just don't. Just ignore them. You don't need them, but someone might. They're not hurting you?