# HG changeset patch
# User zegervdv <zegervdv@me.com>
# Date 1411374418 -7200
# Node ID 7e18562d7570e196b97136aa50cb2323b388ca79
# Parent  17c53827a2e1317c6cc91ce6665aecfc7d5b33b0
Improve gitconfig

diff -r 17c53827a2e1 -r 7e18562d7570 gitconfig
--- a/gitconfig	Sun Sep 21 22:21:46 2014 +0200
+++ b/gitconfig	Mon Sep 22 10:26:58 2014 +0200
@@ -15,6 +15,7 @@
 [core]
         excludesfile = ~/.gitignore
         editor = vim
+	autocrlf = input
 [apply]
         whitespace = nowarn
 [mergetool]
@@ -42,3 +43,7 @@
 [filter "media"]
 	clean = git-media-clean %f
 	smudge = git-media-smudge %f
+[pull]
+	rebase = true
+[rerere]
+	enabled = true
diff -r 17c53827a2e1 -r 7e18562d7570 zshrc
--- a/zshrc	Sun Sep 21 22:21:46 2014 +0200
+++ b/zshrc	Mon Sep 22 10:26:58 2014 +0200
@@ -143,6 +143,7 @@
 alias vim="reattach-to-user-namespace vim"
 # alias ag="ag --color"
 alias dot="cd ~/.dotfiles"
+alias ranger="EDITOR=mvim ranger"
 
 # ag tab complete
 _ag() {