added --ff-only to git pull commands

2021-01-04 13:58:05 -05:00
parent 828b5849a8
commit af2e527b9c
1 changed files with 2 additions and 2 deletions
--- a/update.sh
+++ b/update.sh
@@ -145,7 +145,7 @@ fi
 # clone the homelab scripts for use later
 if [ -d /opt/homelab-scripts ]; then
    cd /opt/homelab-scripts
-    git pull
+    git pull --ff-only
 else
    cd /opt
    git clone https://git.johnhgaunt.com/jgaunt/homelab-scripts
@@ -154,7 +154,7 @@ fi
 # install neofetch
 if [ -d /opt/neofetch ]; then
    cd /opt/neofetch
-    git pull
+    git pull  --ff-only
    make install
 else
    cd /opt