Teach 'git pull' about --rebase