Merge 11738d1b8a into 84c6914a9b

Comments must have `#` starting the line. Inline `#`s would just prevent the ignore lines from working as intended.

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/JetBrains.gitignore

@@ -63,7 +63,8 @@ atlassian-ide-plugin.xml
 
 # SonarLint plugin
 .idea/sonarlint/
-.idea/sonarlint.xml # see https://community.sonarsource.com/t/is-the-file-idea-idea-idea-sonarlint-xml-intended-to-be-under-source-control/121119
+# See https://community.sonarsource.com/t/is-the-file-idea-idea-idea-sonarlint-xml-intended-to-be-under-source-control/121119
+.idea/sonarlint.xml
 
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml

Global/macOS.gitignore

@@ -1,6 +1,5 @@
 # General
 .DS_Store
-.localized
 __MACOSX/
 .AppleDouble
 .LSOverride

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