@b0rk @riamaria
"git pull --rebase" is extremely useful and is IMHO an exception to "you never need to rebase". It rebases your own local commits onto a later upstream commit than you started from.