From 78f22bffb3f59d474efd10b9229e4d30505803e7 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Fri, 19 Jan 2024 16:08:29 +0100
Subject: [PATCH] Update upgrade

---
 scripts/upgrade | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 84db87e..ad39c54 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -77,6 +77,7 @@ then
 	pushd "$install_dir"
 		chown -R "$app:www-data" "$install_dir"
 		git config --system --add safe.directory "$install_dir"
+		git config pull.rebase false
 		
 		ynh_exec_as "$app" git fetch
     	#git checkout master