Dumb question about git

[Trass3r]

> OK, so what's the right way to do it then? I have some changes in a
> branch, but master has been updated since, so I want to merge in the
> latest updates so that the branch changes are compatible with the latest
> code.

I use a quite crappy way to rebase my feature branch:
git stash && git checkout master && git pull -v --rebase && git rebase  
master myworkingbranch

There's probably some redundancy or whatever here, but at least it works ^^