git: very powerful, not easy to use for simple tasks.
Finally, all this can be automated, so that one can simply keep the good old habits from svn and type "git up"!
Here's the recipe. In your ~/.gitconfig, write
Then download the script http://www.davidfaure.fr/scripts/gitup and put it in your $PATH.
Before the git purists start screaming, yes, I know, one should not do that (rebasing when pulling) if sharing your local branch with other people. But let's face it, you usually don't do that :-)