News for hackers. Stuff that matters.

A comment on Fortunately, I don't squash my commits. Parent comment

Re:Fortunately, I don't squash my commits by Nursie on Monday October 05, 2020 @02:05PM (#24690282)
When I read the commit history I want to see what was committed.

"Hmm, I had a half working X509 chain resolver there that turned out to be unnecessary at the time but would save me a day's work now..."

[ Parent | on HN ]
Re:Fortunately, I don't squash my commits by FeepingCreature on Tuesday October 06, 2020 @12:22AM (#24694658)
Keep it on a local branch?
[ Parent | on HN ]
Re:Fortunately, I don't squash my commits by Nursie on Tuesday October 06, 2020 @04:47AM (#24695846)
I'd moved workstation by then. If distributed source control is good for anything, surely it's reducing reliance on local state!

I don't think there's an easy answer here. I think there are good things to be said for a readable and bisect-able version history, but also that if you're not preserving your real commit history in a way that's backed up remotely then something's probably wrong.

I'm beginning to think this area, this schism into two schools of thought, is really a signpost that there's something lacking in git's branching. Or something everyone is missing, including me :)

[ Parent | on HN ]