use rebase instead of merge in auto-update.sh