1 files changed, 4 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 6d8edf5..96ee73a 100644
--- a/gitconfig
+++ b/gitconfig
@@ -15,7 +15,11 @@
 	branch = auto
 [http]
 	sslCAPath = /etc/ssl/certs
+[pull]
+	mergeoptions = --ff-only
+	ff = only
 [merge]
+	ff = false
 	summary = true
 	log = 5000
 [branch "debian-merge"]