X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=git%2F.gitconfig;h=d5e5f811d6f117fcb1151d6036d0411145b4a8f4;hb=0086b2e95af0a088330349dd4e437d032d8bbde4;hp=c1dab1f98c84c3e689d91393f7e7d1404b59a4c9;hpb=30004b962984085b3dc8fad9e2e538abd4c79ec4;p=max%2Fdotfiles.git

diff --git a/git/.gitconfig b/git/.gitconfig
index c1dab1f..d5e5f81 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -8,11 +8,11 @@
 	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]