Better emacs config, make it play nice with git

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

diff --git a/git/.gitconfig b/git/.gitconfig
index f2d54ab53b8cc1020baef3cecd9b639e8742d924..2ac525185740d53e19058ce4b571f9c26a45b388 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -6,9 +6,9 @@
        diff = always
 [user]
        name = Maximilian Friedersdorff
-       email = maxf130@gmail.com
+       email = max@friedersdorff.com
 [core]
-       editor = vim
+       editor = emc
        excludesfile = /home/max/.gitignore
 [merge]
        tool = diffuse