diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..314766e91
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+* text=auto eol=lf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf
diff --git a/.gitignore b/.gitignore
index 51ede2658..67fdfeb93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.pid
 *.log
 *.log.*
+*.out
 *.csv
 *.png
 *.gif