From 27e77ca1b1a10bd2133e76cde770cf385dd2a2a9 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 4 Aug 2025 15:42:31 -0600 Subject: [PATCH] Update functions.php --- resources/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/functions.php b/resources/functions.php index 19f1cbc8a7..066ac8b22a 100644 --- a/resources/functions.php +++ b/resources/functions.php @@ -2435,7 +2435,7 @@ if (!function_exists('git_pull')) { chdir($path); //specify how to reconcile divergent branches - exec('git config pull.rebase true'); + exec('git config pull.rebase false'); //git pull exec("GIT_SSH_COMMAND='ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' git pull 2>&1", $response_source_update);