From 35e4c6e766880e0a393f95a91a461d14c9de6790 Mon Sep 17 00:00:00 2001 From: Clownacy <Clownacy@users.noreply.github.com> Date: Thu, 9 Jan 2020 06:32:10 +0000 Subject: [PATCH 1/3] Mark TSC files as binary, not text --- .gitattributes | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 6cc18834..a9299ca1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,4 +7,7 @@ # Do not change external files external/** -text -DoConfig/fltk/** -text \ No newline at end of file +DoConfig/fltk/** -text + +# TSC files are not text, but 'git diff' likes to think they are +*.tsc binary From 2752deccdf60ac3c13741006ad76a0fa4f30bacb Mon Sep 17 00:00:00 2001 From: Clownacy <Clownacy@users.noreply.github.com> Date: Thu, 9 Jan 2020 06:36:24 +0000 Subject: [PATCH 2/3] Ignore some more files --- .gitignore | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitignore b/.gitignore index 53cf45be..97357ab1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,10 @@ # Exclude build output directory /game +#### +# Accurate branch +#### + # Exclude devilution-comparer assembly output devilution/orig.asm devilution/compare.asm @@ -28,3 +32,10 @@ vs2017/Release (Japanese) vs2017/x64 vs2017/.vs vs2017/CSE2.vcxproj.user + +#### +# Portable branch +#### + +# Exclude converted resource files +src/Resource From 3c7a1b285d5c36c1ddf863e5dcacb6f0e0e38f36 Mon Sep 17 00:00:00 2001 From: Clownacy <Clownacy@users.noreply.github.com> Date: Thu, 9 Jan 2020 06:38:14 +0000 Subject: [PATCH 3/3] Ignore the build folder, and tweak paths --- .gitignore | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 97357ab1..129b9f11 100644 --- a/.gitignore +++ b/.gitignore @@ -9,33 +9,36 @@ #### # Exclude devilution-comparer assembly output -devilution/orig.asm -devilution/compare.asm +/devilution/orig.asm +/devilution/compare.asm # Exclude MSVC IntelliSense database -vs2003/CSE2.ncb +/vs2003/CSE2.ncb # Exclude MSVC Solution User Options file -vs2003/CSE2.suo +/vs2003/CSE2.suo # Exclude MSVC build folders -vs2003/Debug -vs2003/Release -vs2003/Debug (Japanese) -vs2003/Release (Japanese) +/vs2003/Debug +/vs2003/Release +/vs2003/Debug (Japanese) +/vs2003/Release (Japanese) # Exclude Visual Studio 2017 files -vs2017/Debug -vs2017/Release -vs2017/Debug (Japanese) -vs2017/Release (Japanese) -vs2017/x64 -vs2017/.vs -vs2017/CSE2.vcxproj.user +/vs2017/Debug +/vs2017/Release +/vs2017/Debug (Japanese) +/vs2017/Release (Japanese) +/vs2017/x64 +/vs2017/.vs +/vs2017/CSE2.vcxproj.user #### # Portable branch #### # Exclude converted resource files -src/Resource +/src/Resource + +# Exclude the (recommended) CMake build directory +/build