Preserve merges when rebasing in `pull` command
Merge pull request #290 from pmiossec/preserve_merge_rebase

Preserve merges when rebasing in `pull` command