News for hackers. Stuff that matters.

A comment on Squash your commits. Parent comment

Re:Squash your commits by jarfil on Friday April 01, 2016 @05:32PM (#11408757)
If people generate N-1 commits with a final one to clean things up, maybe people should learn about git stash and making some WIP branches, then squashing commits themselves or better yet, keeping their own history clean, instead of submitting PRs full of crap.

I know, it might be too much to ask of people... oh well.

[ Parent | on HN ]
Re:Squash your commits by hinkley on Friday April 01, 2016 @07:06PM (#11409202)
The Mikado method is sadly underemphasized.

Just because you smash away at code for hours doesn't mean that's how your commit history should look. You can revise history in ways that are beneficial instead of destructive.

[ Parent | on HN ]
Re:Squash your commits by cortesoft on Friday April 01, 2016 @08:31PM (#11409585)
What is the cost of just doing it at the last merge step? Makes it easier, doesn't it?
[ Parent | on HN ]
Re:Squash your commits by chris_wot on Saturday April 02, 2016 @03:12AM (#11410589)
Yeah, but dreadful if you try to bisect a problem.
[ Parent | on HN ]
Re:Squash your commits by rjayatilleka on Saturday April 02, 2016 @09:43AM (#11411476)
Yeah, and that's why you squash all the intermediate commits first. If all your commits on master are useful and meaningful individually, bisect works great.
[ Parent | on HN ]