Add ff only

[dotfiles.git] / setup_cli_basics.sh

diff --git a/setup_cli_basics.sh b/setup_cli_basics.sh
index 949417b0930ccd7ff72e483b36033a8b1a4f028e..547cb90d23d3cf63dee5e428684d38759151f783 100755 (executable)
--- 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"
        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
 fi
 
 if [ ! -f ~/.ssh/id_ed25519 ]; then