diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 0df25dc90..71b1dc0d8 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -78,6 +78,7 @@
 | git-commit | ✓ | ✓ |  |  |
 | git-config | ✓ | ✓ |  |  |
 | git-ignore | ✓ |  |  |  |
+| git-notes | ✓ |  |  |  |
 | git-rebase | ✓ |  |  |  |
 | gjs | ✓ | ✓ | ✓ | `typescript-language-server`, `vscode-eslint-language-server`, `ember-language-server` |
 | gleam | ✓ | ✓ |  | `gleam` |
diff --git a/languages.toml b/languages.toml
index 55584791b..8f8b9ac42 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1868,6 +1868,16 @@ grammar = "gitcommit"
 name = "gitcommit"
 source = { git = "https://github.com/gbprod/tree-sitter-gitcommit", rev = "a716678c0f00645fed1e6f1d0eb221481dbd6f6d" }
 
+[[language]]
+name = "git-notes"
+scope = "git.notesmsg"
+file-types = [{ glob = "NOTES_EDITMSG" }]
+comment-token = "#"
+indent = { tab-width = 4, unit = "    " }
+rulers = [73]
+text-width = 72
+grammar = "gitcommit"
+
 [[language]]
 name = "diff"
 scope = "source.diff"
diff --git a/runtime/queries/git-notes/highlights.scm b/runtime/queries/git-notes/highlights.scm
new file mode 100644
index 000000000..4bb7d675d
--- /dev/null
+++ b/runtime/queries/git-notes/highlights.scm
@@ -0,0 +1 @@
+(comment) @comment