From e0aaf1fde04d8e960ab7f0bc333781296cdc4bdc Mon Sep 17 00:00:00 2001 From: Edward Delaporte Date: Thu, 22 Dec 2022 09:00:29 -0600 Subject: [PATCH] Add ff only --- setup_cli_basics.sh | 1 + 1 file changed, 1 insertion(+) 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 -- 2.47.3