git pull --rebase  # --dry-run to test first