News for hackers. Stuff that matters.
Re:Two Years of Squash Merge (2019) by leafmeal on Friday April 30, 2021 @03:33PM (#26998199)
Fixup commits are a good way to work around this. https://git-scm.com/docs/git-commit#Documentation/git-commit...

You still create your "clean up" commits, but it's done in a way where git can automatically squash everything back together in the end.

See also https://git-scm.com/docs/git-rebase#Documentation/git-rebase...

Re:Two Years of Squash Merge (2019) by maxioatic on Friday April 30, 2021 @03:42PM (#26998315)
Huh, never knew about this. Seems quite useful. Thanks!