diff --git a/.gitattributes b/.gitattributes index ef225ce2b..a74388f46 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ # .gitattributes # prevent binary files from CRLF handling, diff and merge: fpga/fpga.bit -crlf -diff +*.bin -crlf -diff \ No newline at end of file diff --git a/.gitignore b/.gitignore index 24761385f..8cc16c3c2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,19 +12,26 @@ *.s19 *.map *.bin +!client/hardnested/*.bin +!client/hardnested/tables/*.bin *.dll *.moc.cpp *.z +usb_cmd.lua +version.c +client/ui/ui_overlays.h +*.Td + *.exe *.dsym hardnested_stats.txt -proxmark proxmark3 flasher -fpga_compress -version.c lua luac +fpga_compress +mfkey32 +mfkey64 fpga/* !fpga/tests @@ -39,4 +46,5 @@ fpga/* !fpga/sim.tcl #client/* +# my own traces folder client/traces/*