pull: allow pull to preserve merges when rebasing