git: very powerful, not easy to use for simple tasks.
Especially when coming from svn, where updating a local checkout was simply "svn up", and with git it's "git pull --rebase, and if that fails, stash, pull --rebase, stash pop".
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
up = !gitup
Then download the script http://www.davidfaure.fr/scripts/gitup and put it in your $PATH.
(Should have done that years ago...)