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

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