diff --git a/git/config b/git/config
index af2e623..5a2cdb9 100644
--- a/git/config
+++ b/git/config
@@ -7,3 +7,7 @@
 	default = simple
 [alias]
     lg = log --oneline --graph --decorate
+[merge]
+	ff = false
+[credential]
+	helper = cache