My usual workflow when working with git, is something like this:
On newer versions of git you can use
git branch --track origin/branch_name