Use git up and save your time

I strongly encourage you to check out the git up command.

It basically synchronizes your local repo by stashing, fetching, checking out each branch, rebasing, fast-forwarding and more.

It updates all local braches, by rebasing them instead of merging.

See also: Use .cvsignore as your global gitignore filename.