Update to use the rebase strategy that perserves merges on git-pull