git: Change --preserve-merges to --rebase-merges.
git: Change --preserve-merges to --rebase-merges.

Fixes the following warning:

    warning: git rebase --preserve-merges is deprecated. Use --rebase-merges instead.

s3rvac/dotfiles,s3rvac/dotfiles,s3rvac/dotfiles