diff --git a/git/.gitconfig b/git/.gitconfig
index df12f5a..937c886 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -17,7 +17,8 @@
 [branch "develop"]
   mergeoptions = --no-ff
 [pull]
-  rebase = true
+  #rebase = true
+  ff = only
 [tag]
   forceSignAnnotated = true
 [ghq]