From 533c53b153c3eb3b4b2de1233da7c0861e09a329 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Fri, 21 Oct 2022 13:33:53 +0200
Subject: [PATCH] stop merge commits

---
 ubuntu_setup.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ubuntu_setup.sh b/ubuntu_setup.sh
index 7b3ae5817..7aeece5e3 100644
--- a/ubuntu_setup.sh
+++ b/ubuntu_setup.sh
@@ -5,6 +5,7 @@ apt -y install git redis-server python3-pip ffmpeg imagemagick tmux nginx snapd
 
 git config --global credential.helper store
 cd /rDrama
+git config branch.frost.rebase true
 cp ./env /env
 . /env