diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..ef225ce2b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+# .gitattributes
+# prevent binary files from CRLF handling, diff and merge:
+fpga/fpga.bit -crlf -diff
+ 
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 3f6347a0d..97862aaa5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # .gitignore
 # don't push these files to the repository
 
+*.log
 *.o
 *.a
 *.d