From: Edward Delaporte <delaport@illinois.edu>
Date: Thu, 22 Dec 2022 15:00:29 +0000 (-0600)
Subject: Add ff only
X-Git-Url: https://us-delaporte.pagekite.me/gitweb/dotfiles.git/commitdiff_plain/e0aaf1fde04d8e960ab7f0bc333781296cdc4bdc

Add ff only
---

diff --git a/setup_cli_basics.sh b/setup_cli_basics.sh
index 949417b..547cb90 100755
--- a/setup_cli_basics.sh
+++ b/setup_cli_basics.sh
@@ -19,6 +19,7 @@ if [ -f ~/.gitconfig ]; then
 	echo "************** Configure Git user"
 	git config --global user.email "edward@delaporte.us"
 	git config --global user.name "Edward Delaporte"
+	git config --global pull.ff only
 fi
 
 if [ ! -f ~/.ssh/id_ed25519 ]; then