]> git.friedersdorff.com Git - max/dotfiles.git/commitdiff
projects / max / dotfiles.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 50f4023)
No fastforward merges by default
authorMaximilian Friedersdorff <maxf130@gmail.com>
Thu, 29 Sep 2016 15:54:25 +0000 (16:54 +0100)
committerMaximilian Friedersdorff <maxf130@gmail.com>
Thu, 29 Sep 2016 15:54:25 +0000 (16:54 +0100)
git/.gitconfig patch | blob | history

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]
Unnamed repository; edit this file 'description' to name the repository.