stop merge commits

2022-10-21 13:33:53 +02:00 · 2022-10-21 13:33:53 +02:00 · 533c53b153
parent 7dca905766
commit 533c53b153
1 changed files with 1 additions and 0 deletions
--- 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