diff --git a/.gitmodules b/.gitmodules
index 422671b4e..8b4b14bbb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -178,3 +178,7 @@
 	path = helix-syntax/languages/tree-sitter-git-diff
 	url = https://github.com/the-mikedavis/tree-sitter-git-diff.git
 	shallow = true
+[submodule "helix-syntax/languages/tree-sitter-rebase"]
+	path = helix-syntax/languages/tree-sitter-rebase
+	url = https://github.com/the-mikedavis/tree-sitter-rebase.git
+	shallow = true
diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 91575c629..0378aec8a 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -35,6 +35,7 @@
 | protobuf | ✓ |  | ✓ |  |
 | python | ✓ | ✓ | ✓ | `pylsp` |
 | racket |  |  |  | `racket` |
+| rebase | ✓ |  |  |  |
 | ruby | ✓ |  | ✓ | `solargraph` |
 | rust | ✓ | ✓ | ✓ | `rust-analyzer` |
 | scala | ✓ |  | ✓ | `metals` |
diff --git a/helix-syntax/languages/tree-sitter-rebase b/helix-syntax/languages/tree-sitter-rebase
new file mode 160000
index 000000000..4b572504d
--- /dev/null
+++ b/helix-syntax/languages/tree-sitter-rebase
@@ -0,0 +1 @@
+Subproject commit 4b572504d80832c3271dc1c9b351c756dbe75d37
diff --git a/languages.toml b/languages.toml
index c3ae9f628..a005ac9be 100644
--- a/languages.toml
+++ b/languages.toml
@@ -490,3 +490,12 @@ file-types = ["diff"]
 injection-regex = "diff"
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
+
+[[language]]
+name = "rebase"
+scope = "git.rebase"
+roots = []
+file-types = ["git-rebase-todo"]
+injection-regex = "rebase"
+comment-token = "#"
+indent = { tab-width = 2, unit = " " }