On: A simple git branching model

[programminggeek]

I avoid rebase like the plague if I'm working on a team, and if I'm not working on a team I don't see the need for it much either.

[djbender → programminggeek]

Rebase is good for when you need to rewrite or clean-up history. For example: all those "WIP" commits you'll frequently see aren't exactly helpful. If you want to rewrite history of a branch that others are actively working on, well then you're going to have A Bad Time™.