News for hackers. Stuff that matters.

A comment on Git Workflow Basics. Parent comment

Re:Git Workflow Basics by stormbrew on Wednesday August 17, 2016 @11:26AM (#12305385)
I'm sure someone out there does it like that (the joy and pain of git being there's a million ways of doing things), but the name I think is derived from the idea that you're replacing a merge commit with a squash of the disjoint parent, rather than a merge of a squash.

Also it's entirely possible I'm wrong, I'm a fan of merge bubbles (sometimes rebased for clarity), and avoid large squashes in general, so maybe I just don't understand how people do it. I don't know why you'd bother to keep both a merge and squash commit around, though.

[ Parent | on HN ]
Re:Git Workflow Basics by steveklabnik on Wednesday August 17, 2016 @11:31AM (#12305423)
No, I think you're right; take a look at the graphs on https://github.com/blog/2141-squash-your-commits for example.

I don't know why you'd want to do it that way either! But I also don't understand why you'd want to "never rebase", so when it comes to git, I assume that someone has reasons for doing all kinds of things I don't understand.

[ Parent | on HN ]