1 files changed, 0 insertions, 2 deletions

diff --git a/gitconfig b/gitconfig
index 2836cb8..cd7a5ec 100644
--- a/gitconfig
+++ b/gitconfig
@@ -10,7 +10,5 @@
 	gpgsign = true
 [merge]
 	tool = vimdiff
-[pull]
-	ff = only
 [commit]
 	gpgSign = true