I'm a huge fan of squash rebase, myself. really it's my default, and I find it particularly useful for long run branches.