Merge 71823a71a3 into 84c6914a9b

C++.gitignore

@@ -49,14 +49,14 @@ CMakeFiles/
 CMakeCache.txt
 cmake_install.cmake
 Makefile
-install_manifest.txt
+install_manifest.txt 
 compile_commands.json
 
 # Temporary files
-*.tmp
-*.log
-*.bak
-*.swp
+*.tmp 
+*.log 
+*.bak 
+*.swp 
 
 # vcpkg
 vcpkg_installed/
@@ -66,4 +66,4 @@ vcpkg_installed/
 
 # test output & cache
 Testing/
-.cache/
+.cache/

Global/macOS.gitignore

@@ -1,26 +1,25 @@
-# General
-.DS_Store
-.localized
-__MACOSX/
-.AppleDouble
-.LSOverride
-Icon[␍]
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
+# General
+.DS_Store
+__MACOSX/
+.AppleDouble
+.LSOverride
+Icon[\r]
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

Maven.gitignore

@@ -7,7 +7,7 @@ release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
-# https://maven.apache.org/tools/wrapper/#Usage_with_or_without_Binary_JAR
+# https://maven.apache.org/wrapper/#usage-without-binary-jar
 .mvn/wrapper/maven-wrapper.jar
 
 # Eclipse m2e generated files

Nix.gitignore

@@ -4,6 +4,3 @@ result-*
 
 # Ignore automatically generated direnv output
 .direnv
-
-# Ignore NixOS interactive test driver history
-**/.nixos-test-history

TeX.gitignore

@@ -75,11 +75,6 @@ acs-*.bib
 # comment
 *.cut
 
-# context
-*.tuc
-*.tui
-*.tuo
-
 # cprotect
 *.cpt