have "git pullall" alias auto-detect a shared branch and merge instead of rebasing
For our new workflow, on a feature branch we want to merge rather than rebase if it's been posted for review. We'd like "git pullall" to automagically do this for us.