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

diff --git a/git/.gitconfig b/git/.gitconfig
index c9dc715..778a220 100644
--- 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 = true
 [push]
 	default = simple
 [alias]