diff --git a/src/kakrc b/src/kakrc
index 39aecbc6..0fa8511f 100644
--- a/src/kakrc
+++ b/src/kakrc
@@ -2,3 +2,4 @@ hook global WinCreate .* addhl regex \h+(?=\n) default red
 
 runtime rc/cpp.kak
 runtime rc/kakrc.kak
+runtime rc/git.kak
diff --git a/src/rc/git.kak b/src/rc/git.kak
new file mode 100644
index 00000000..4d5603fe
--- /dev/null
+++ b/src/rc/git.kak
@@ -0,0 +1,12 @@
+hook global WinCreate .*COMMIT_EDITMSG \
+    addhl group hlgit; \
+    addgrouphl hlgit regex "#[^\n]*\n" cyan default; \
+    addgrouphl hlgit regex "\<(modified|deleted|new file):[^\n]*\n" magenta default; \
+    addgrouphl hlgit regex "\<(modified|deleted|new file):" red default;
+
+hook global WinCreate .*git-rebase-todo \
+    addhl group hlgit; \
+    addgrouphl hlgit regex "#[^\n]*\n" cyan default; \
+    addgrouphl hlgit regex "^(pick|edit|reword|squash|fixup|exec|[persfx]) \w+" magenta default; \
+    addgrouphl hlgit regex "^(pick|edit|reword|squash|fixup|exec|[persfx])" green default;
+