From 150d2de2a0370fa66131d0c1a61aaeb538d7d383 Mon Sep 17 00:00:00 2001 From: Richard Date: Fri, 10 Apr 2026 14:54:20 -0600 Subject: [PATCH 1/3] GIT: .gitattributes, .gitignore and *.cmake are text files --- .gitattributes | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 63a2b0dc3..6fac4adbe 100644 --- a/.gitattributes +++ b/.gitattributes @@ -13,4 +13,6 @@ *.crd binary *.dck binary sim_rev.h export-subst - +*.cmake text=auto +.gitattributes text=auto +.gitignore text=auto From 8dcae6448b038d3729c9ebe0f54d49fb220e9206 Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 4 May 2026 08:53:25 -0600 Subject: [PATCH 2/3] GIT: native line endings for .gitattributes, .gitignore --- .gitattributes | 36 +++++++-------- .gitignore | 122 ++++++++++++++++++++++++------------------------- 2 files changed, 79 insertions(+), 79 deletions(-) diff --git a/.gitattributes b/.gitattributes index 6fac4adbe..382bab0ba 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,18 +1,18 @@ -*.jpg binary -*.png binary -*.sln binary -*.vcproj binary -*.exe binary -*.lda binary -*.bin binary -*.imd binary -*.rim binary -*.tap binary -*.dsk binary -*.vhd binary -*.crd binary -*.dck binary -sim_rev.h export-subst -*.cmake text=auto -.gitattributes text=auto -.gitignore text=auto +*.jpg binary +*.png binary +*.sln binary +*.vcproj binary +*.exe binary +*.lda binary +*.bin binary +*.imd binary +*.rim binary +*.tap binary +*.dsk binary +*.vhd binary +*.crd binary +*.dck binary +sim_rev.h export-subst +*.cmake text=auto +.gitattributes text=auto +.gitignore text=auto diff --git a/.gitignore b/.gitignore index 95af0ca9a..b625ddbda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,61 +1,61 @@ -.git-commit-id -.git-commit-id.h -#ignore thumbnails created by windows -Thumbs.db -#ignore Desktop Services Store created by OSX -.DS_Store -#Ignore files built by Visual Studio -*.obj -*.exe -# VAX/vmb.exe is not a generated file and should be in the repository -!VAX/vmb.exe -*.pdb -*.user -*.aps -*.pch -*.vspscc -*_i.c -*_p.c -*.ncb -*.suo -*.tlb -*.tlh -*.bak -*.cache -*.ilk -*.log -[Bb]in -[Dd]ebug*/ -*.lib -*.sbr -*.bak -*.save -obj/ -[Rr]elease*/ -_ReSharper*/ -[Tt]est[Rr]esult* -*.o -*~ -*# -BIN/ -ipch/ -# Visual Studio, Visual Code directories: -.vscode/ -.vs/ -build/ -# We only care about specific files in the Visual Studio Projects -# folder. Things which are there on the fly to support debugging -# or other things we don't want git to manage. -Visual Studio Projects/* -!Visual Studio Projects/*.vcproj -!Visual Studio Projects/*.vcxproj* -!Visual Studio Projects/*.sln -Visual Studio Projects/~AutoRecover.* -!Visual Studio Projects/0ReadMe_Projects.txt -**/*.code-workspace -**/.vscode/ -# Visual Studio artifacts in CMake mode -out/ -CMakeSettings.json -## Staging area for cmake install (default install prefix) -SIMH-install +.git-commit-id +.git-commit-id.h +#ignore thumbnails created by windows +Thumbs.db +#ignore Desktop Services Store created by OSX +.DS_Store +#Ignore files built by Visual Studio +*.obj +*.exe +# VAX/vmb.exe is not a generated file and should be in the repository +!VAX/vmb.exe +*.pdb +*.user +*.aps +*.pch +*.vspscc +*_i.c +*_p.c +*.ncb +*.suo +*.tlb +*.tlh +*.bak +*.cache +*.ilk +*.log +[Bb]in +[Dd]ebug*/ +*.lib +*.sbr +*.bak +*.save +obj/ +[Rr]elease*/ +_ReSharper*/ +[Tt]est[Rr]esult* +*.o +*~ +*# +BIN/ +ipch/ +# Visual Studio, Visual Code directories: +.vscode/ +.vs/ +build/ +# We only care about specific files in the Visual Studio Projects +# folder. Things which are there on the fly to support debugging +# or other things we don't want git to manage. +Visual Studio Projects/* +!Visual Studio Projects/*.vcproj +!Visual Studio Projects/*.vcxproj* +!Visual Studio Projects/*.sln +Visual Studio Projects/~AutoRecover.* +!Visual Studio Projects/0ReadMe_Projects.txt +**/*.code-workspace +**/.vscode/ +# Visual Studio artifacts in CMake mode +out/ +CMakeSettings.json +## Staging area for cmake install (default install prefix) +SIMH-install From b439513af6dbe4f560314973a975400d6986760b Mon Sep 17 00:00:00 2001 From: Richard Date: Sun, 12 Apr 2026 16:19:10 -0600 Subject: [PATCH 3/3] GIT: Ignore CMakeUserPresets.json CMakePresets.json are intended to be shared and committed; CMakeUserPresets.json are intended to be per-user, not shared and not committed. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b625ddbda..13671db9d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +CMakeUserPresets.json .git-commit-id .git-commit-id.h #ignore thumbnails created by windows