diff gitconfig @ 119:7e18562d7570

Improve gitconfig
author zegervdv <zegervdv@me.com>
date Mon, 22 Sep 2014 10:26:58 +0200
parents 044395254e27
children 860548f92a96
line wrap: on
line diff
--- 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