Yeah I've been using git regularly for a year or so now and have never run into having to do wacky stuff like rebasing and whatnot. I just stick to the normal checkout new branch, hack on stuff, merge branch, move on. The more boring and simple my git use the better IMHO.