From: pwpiwi Date: Fri, 27 Jun 2014 17:23:42 +0000 (+0200) Subject: git housekeeping: X-Git-Tag: v1.1.0~3 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/0dcf1ee3fdee8e07b68e086312cbdc3ea26d3745 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 index 00000000..ef225ce2 --- /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 3f6347a0..97862aaa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # .gitignore # don't push these files to the repository +*.log *.o *.a *.d