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 3np on Monday October 05, 2020 @08:25AM (#24687067)
Routinely. Common example that I can't see why anyone would take issue with:

  * Commit 1: Fix a bug
  * Commit 2: Fix linting issues with the fix discovered through CI
  * Commit 3: Remove dead/commented code introduced thrugh commit 1
  * Commit 4: Update documents as required by change
I'd always squash those into a single commit before merging into upstream.
[ Parent | on HN ]
Re:Fortunately, I don't squash my commits by asveikau on Monday October 05, 2020 @03:06PM (#24690897)
I can see a good case for separating #2 from everything else. Or depending on the change, maybe squashing #2 and #3 together separate from 1 and 4.

It's a good idea to isolate the bugfix so that reading the diff is clear. Stylistic changes such as #2 and #3 can be separated and called out as "should produce no behavior change" sort of updates.

[ Parent | on HN ]