X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=git%2F.gitconfig;h=f2d54ab53b8cc1020baef3cecd9b639e8742d924;hb=d4686f7d2de2f40700aa01e6591921ac28ac9d70;hp=c9dc7150a0db980581ef699f331717205fd0a623;hpb=d67cb7a54710bb17a2009b3fe4c69371f2f73b25;p=max%2Fdotfiles.git

diff --git a/git/.gitconfig b/git/.gitconfig
index c9dc715..f2d54ab 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -12,6 +12,7 @@
 	excludesfile = /home/max/.gitignore
 [merge]
 	tool = diffuse
+        ff = false
 [push]
 	default = simple
 [alias]