git housekeeping:

- added *.log files to .gitignore
- new file .gitattributes: tell git not to diff or merge binary *.bit (FPGA) files

diff --git a/.gitattributes b/.gitattributes
new file mode 100644 (file)
index 0000000..ef225ce
--- /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 3f6347a0d9deb9960d368e0062168a7f1a7ebdc9..97862aaa58823a6795e11cc813fae177743d61c7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # .gitignore
 # don't push these files to the repository
 
+*.log
 *.o
 *.a
 *.d