diff --git a/.gitattributes b/.gitattributes
index ec56b50dc94..a3550843103 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,8 +5,10 @@
 # git add --renormalize .
 # git status  [just to show what files were renormalized]
 # git commit -m "Normalize line endings"
+
 # Anything Git auto-detects as text gets normalized and checked out as LF
 * text=auto eol=lf
+
 # Explicitly set a bunch of known extensions to text, in case auto detection gets confused.
 *.ql text
 *.qll text
@@ -38,6 +40,7 @@
 *.lua text
 *.expected text
 *.go text
+
 # Explicitly set a bunch of known extensions to binary, because Git < 2.10 will treat
 # `* text=auto eol=lf` as `* text eol=lf`
 *.png -text
@@ -46,8 +49,11 @@
 *.gif -text
 *.dll -text
 *.pdb -text
+
 java/ql/test/stubs/**/*.java linguist-generated=true
 java/ql/test/experimental/stubs/**/*.java linguist-generated=true
+/java/kotlin-extractor/deps/*.jar filter=lfs diff=lfs merge=lfs -text
+
 # Force git not to modify line endings for go or html files under the go/ql directory
 go/ql/**/*.go -text
 go/ql/**/*.html -text
@@ -55,18 +61,21 @@ go/ql/**/*.html -text
 go/*.dbscheme -text
 # Preserve unusual line ending from codeql-go merge
 go/extractor/opencsv/CSVReader.java -text
+
 # For some languages, upgrade script testing references really old dbscheme
 # files from legacy upgrades that have CRLF line endings. Since upgrade
 # resolution relies on object hashes, we must suppress line ending conversion
 # for those testing dbscheme files.
 */ql/lib/upgrades/initial/*.dbscheme -text
+
 # Generated test files - these are synced from the standard JavaScript libraries using
 # `javascript/ql/experimental/adaptivethreatmodeling/test/update_endpoint_test_files.py`.
 javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/autogenerated/**/*.js linguist-generated=true -merge
 javascript/ql/experimental/adaptivethreatmodeling/test/endpoint_large_scale/autogenerated/**/*.ts linguist-generated=true -merge
+
 # Auto-generated modeling for Python
 python/ql/lib/semmle/python/frameworks/data/internal/subclass-capture/*.yml linguist-generated=true
+
 # auto-generated bazel lock file
 ruby/extractor/cargo-bazel-lock.json linguist-generated=true
 ruby/extractor/cargo-bazel-lock.json -merge
-/java/kotlin-extractor/deps/*.jar filter=lfs diff=lfs merge=lfs -text