sane rebase/pull defaults

not that you should ever use git pull