News for hackers. Stuff that matters.
Re:Oh Shit, Git by kps on Saturday June 25, 2022 @01:12PM (#31876922)
My mental model of a git repo is basically a stack of backup tapes with sticky notes on them that say “this is tape #2983 and it's almost the same as tape #2429, except that I fixed a typo.” Things like `git log` and common workflows make you think “this is change #2983, where I fixed a typo”, and that's where the trouble starts.
Re:Oh Shit, Git by duped on Saturday June 25, 2022 @01:35PM (#31877101)
It's an organizational and personal thing, but you really have to get in the habit of treating commits as single diffs to the codebase and not the equivalent of ctrl + s in your editor.

I try and make a habit of squashing my commits so that git log is a narrative of development and each commit is a page number, not a sticky note.