X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=git%2F.gitconfig;h=c1dab1f98c84c3e689d91393f7e7d1404b59a4c9;hb=e303ff886611ec4c2e780194076536b0ec2cfc1b;hp=f2d54ab53b8cc1020baef3cecd9b639e8742d924;hpb=5e2fc56bcb7dcf29179e6bf0ac965e37506cd3d1;p=max%2Fdotfiles.git

diff --git a/git/.gitconfig b/git/.gitconfig
index f2d54ab..c1dab1f 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,12 +3,12 @@
 	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