X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=git%2F.gitconfig;h=f2d54ab53b8cc1020baef3cecd9b639e8742d924;hb=5e2fc56bcb7dcf29179e6bf0ac965e37506cd3d1;hp=c9dc7150a0db980581ef699f331717205fd0a623;hpb=50f40239982c206e2b7e5e4aee23838162c170b2;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]