News for hackers. Stuff that matters.
Re:Fortunately, I don't squash my commits by xorcist on Monday October 05, 2020 @12:08PM (#24689000)
The difference between fixups and squashing is only in how the commit message is generated.

Both are (interactive) rebase operations. Both are established terms in git, and it is probably not very useful to change that nomenclature now.

Re:Fortunately, I don't squash my commits by twic on Monday October 05, 2020 @01:41PM (#24690023)
They're the same technical operation, but they're used in different ways, and it's the difference in use that matters. It's useful to be able to distinguish them. It's never too late to improve our terminology! How long had git diff --cached been around when git diff --staged was introduced?