[tasuki]

> Rebasing just seems to cause a lot more headache when something doesn't go perfectly correct in between commits.

You mean merge conflicts? Rebase gives you an opportunity to deal with small merge conflicts arising from single commits. I much prefer that to a big merge commit dealing with all the conflicts simultaneously.

Also, rebase makes the merge conflicts disappear for future readers, making the included commits nicer to read.