X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=git%2F.gitconfig;h=778a22074f6337dab537402c80779e0026b811ec;hb=243abbfb507645037bcdc85d9bd5798776c1e46a;hp=c1dab1f98c84c3e689d91393f7e7d1404b59a4c9;hpb=30004b962984085b3dc8fad9e2e538abd4c79ec4;p=max%2Fdotfiles.git

diff --git a/git/.gitconfig b/git/.gitconfig
index c1dab1f..778a220 100644
--- 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]