X-Git-Url: https://us-delaporte.pagekite.me/gitweb/dotfiles.git/blobdiff_plain/d2ca7d9e0c86b833cb4f1bd90cc248ce6f2e6f71..9d11ffeae443fd1beba120cf7dfed796c3394ef5:/setup_cli_basics.sh

diff --git a/setup_cli_basics.sh b/setup_cli_basics.sh
index 949417b..09768ff 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
@@ -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