use rebase-pull for oh-my-zsh