Use i3lock for i3 screen locking instead

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

diff --git a/git/.gitconfig b/git/.gitconfig
index 2ac525185740d53e19058ce4b571f9c26a45b388..d5e5f811d6f117fcb1151d6036d0411145b4a8f4 100644 (file)
--- 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]