From cba46bfc23cd0b2ac244dcef4587e6ca3e2f4f09 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Tue, 14 Oct 2025 11:51:19 -0700 Subject: [PATCH] Add explicit rebase. --- cronjob.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cronjob.sh b/cronjob.sh index 79c880f..f2efbd9 100755 --- a/cronjob.sh +++ b/cronjob.sh @@ -12,7 +12,7 @@ echo "*** Running cronjob @ `date` ***" cd $DIR # Pull any updates, and if the project is already up to date, exit successfully. -git pull | grep -v "up to date" +git pull --rebase | grep -v "up to date" status="$?" echo "* Pull status is '$status'." if [[ $status != 0 ]]; then