Preserve merges when rebasing in `pull` command