Setup autorebase for git pulls (Will do git pull --rebase) (to pull without rebase do git pull --no-rebase)