X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=git%2F.gitconfig;h=d5e5f811d6f117fcb1151d6036d0411145b4a8f4;hb=d25626d536cb1292bfae5dd7e683ede7c96c021a;hp=2ac525185740d53e19058ce4b571f9c26a45b388;hpb=9079822dd2d96f14dcd4cc94cc42bf3c0179558a;p=max%2Fdotfiles.git

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