Allow fast forwarding

diff --git a/git/.gitconfig b/git/.gitconfig
index c1dab1f98c84c3e689d91393f7e7d1404b59a4c9..778a22074f6337dab537402c80779e0026b811ec 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -12,7 +12,7 @@
        excludesfile = /home/max/.gitignore
 [merge]
        tool = diffuse
-        ff = false
+        ff = true
 [push]
        default = simple
 [alias]