diff --git a/.mikaela/gitconfig b/.mikaela/gitconfig
index 72e708c9..1de9516f 100644
--- a/.mikaela/gitconfig
+++ b/.mikaela/gitconfig
@@ -20,6 +20,7 @@
 [core]
 	editor = vim
 	autocrlf = input
+	safecrlf = warn
 [color]
 	# From git manpage and http://book.git-scm.com/5_customizing_git.html
 	branch = true
diff --git a/conf/gitconfig b/conf/gitconfig
index a315ef56..17934e00 100644
--- a/conf/gitconfig
+++ b/conf/gitconfig
@@ -20,6 +20,7 @@
 [core]
 	editor = vim
 	autocrlf = input
+	safecrlf = warn
 [color]
 	# From git manpage and http://book.git-scm.com/5_customizing_git.html
 	branch = true