No fastforward merges by default

[max/dotfiles.git] / git / .gitconfig

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