From 0a2eabd59a3e23ad5904cf20a79d941ae3a0f806 Mon Sep 17 00:00:00 2001 From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> Date: Wed, 19 Sep 2018 21:49:10 -0400 Subject: [PATCH] Refactor .gitattributes and .gitignore --- .gitattributes | 41 ++++++++++++++++++++++++++++++++--------- .gitignore | 1 + 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.gitattributes b/.gitattributes index c0197ac4f..63f271aff 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,11 +1,34 @@ -# No monkey business with line endings -* -text +# Auto detect text files and perform LF normalization +* text eol=lf -# hexdump binary files -*.png binary diff=hex -*.lz binary diff=hex +# Explicitly declare text files you want to always be normalized and converted +# to native line endings on checkout. + +# files part of the build +*.asm text +*.pal text +*.link text +*.txt text + +# extra files +*.awk text +*.c text +*.h text +*.MD text +*.py text +*.sh text +*.sha1 text + +# Denote all files that are truly binary and should not be modified. +*.png binary diff=hex +*.lz.* binary diff=hex +*.bin binary diff=hex +*.blk binary diff=hex +*.rle binary diff=hex +*.attrmap binary diff=hex +*.tilemap binary diff=hex + +# these are generated but just in case +*.lz binary diff=hex *.2bpp binary diff=hex -*.1bpp binary diff=hex -*.bin binary diff=hex -*.blk binary diff=hex - +*.1bpp binary diff=hex \ No newline at end of file diff --git a/.gitignore b/.gitignore index d3dfbf82b..3a781d1df 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ *.sgm *.sav *.rtc +*.sn* # rgbds extras *.map