Merge branch 'master' of git.friedersdorff.com:max/dotfiles

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

diff --git a/git/.gitconfig b/git/.gitconfig
index c9dc7150a0db980581ef699f331717205fd0a623..c1dab1f98c84c3e689d91393f7e7d1404b59a4c9 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,15 +3,16 @@
        branch = always
        status = always
        interactive = always
-       diff = always
+       diff = true
 [user]
        name = Maximilian Friedersdorff
-       email = maxf130@gmail.com
+       email = max@friedersdorff.com
 [core]
-       editor = vim
+       editor = emc
        excludesfile = /home/max/.gitignore
 [merge]
        tool = diffuse
+        ff = false
 [push]
        default = simple
 [alias]