diff --git a/rc/base/git.kak b/rc/base/git.kak
index 7648f435..b171df95 100644
--- a/rc/base/git.kak
+++ b/rc/base/git.kak
@@ -1,4 +1,4 @@
-hook global BufCreate .*COMMIT_EDITMSG %{
+hook global BufCreate .*(COMMIT_EDITMSG|MERGE_MSG) %{
     set buffer filetype git-commit
 }