Allow pull to preserve merges when rebasing (git 1.8.5).