From 8225785dccdca38d74401ef5b4cf09a2ec53a963 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Mon, 30 Mar 2020 15:49:03 -0700
Subject: [PATCH] Only FF when running pull from install script.

---
 install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 85d9af8..b4f2836 100755
--- a/install.sh
+++ b/install.sh
@@ -337,7 +337,7 @@ install_dotfiles() {
 
 install_main() {
   test -d ${BASEDIR}/.git && command -v git >/dev/null 2>&1 && \
-    git -C ${BASEDIR} pull
+    git -C ${BASEDIR} pull --ff-only
   test $MINIMAL = 1 || command -v git >/dev/null 2>&1 && \
     git -C ${BASEDIR} submodule update --init --recursive
   test $MINIMAL = 1 || prerequisites