I think that would be the same thing. A pull --rebase is like doing a fetch then a fast-forward merge. I'm OK with whatever as long as it doesn't pop the editor. 

Maybe the better alternative is to add an env to not run that git pull command.