License name

[dotfiles.git] / setup_cli_basics.sh

diff --git a/setup_cli_basics.sh b/setup_cli_basics.sh
index 949417b0930ccd7ff72e483b36033a8b1a4f028e..09768ffcefded9a96e76e0d4e011b08e60fe256d 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"
+       git config --global pull.ff only
 fi
 
 if [ ! -f ~/.ssh/id_ed25519 ]; then
@@ -26,7 +27,7 @@ if [ ! -f ~/.ssh/id_ed25519 ]; then
        ssh-keygen -t ed25519
 
        echo "************** Reminder to setup GitHub key"
-       cat GitHubKey.md
+       cat ~/dotfiles/files/GitHubKey.md
        cat ~/.ssh/id_rsa.pub
 fi