pull is now --rebase