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