diff --git a/git/gitconfig b/git/gitconfig
index 951c297..3b719d3 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -10,6 +10,7 @@
     name = James Dixon
 [credential]
     username = lemonase
+    helper = store
 [color]
     ui = true
     status = auto
@@ -18,6 +19,8 @@
     tool = vimdiff
 [difftool]
     prompt = false
+[pull]
+    ff = only
 [alias]
     a = add
     aa = add --all