X-Git-Url: https://us-delaporte.pagekite.me/gitweb/dotfiles.git/blobdiff_plain/d2ca7d9e0c86b833cb4f1bd90cc248ce6f2e6f71..00d8a320095911c41a2870322176e45fbcaf86d9:/setup_cli_basics.sh?ds=sidebyside

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