Revert "Add alias to rebase instead of merging when updating a VCS."

This reverts commit 912771aa656c202526efd743143e6f19ca89471a.