X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=git%2F.gitconfig;h=d5e5f811d6f117fcb1151d6036d0411145b4a8f4;hb=ad6881023c6611b58b23504483db7b6848bd7561;hp=c1dab1f98c84c3e689d91393f7e7d1404b59a4c9;hpb=84769f191fb4c0fa07637f6fcc2b4a768eac0812;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]