diff --git a/neovim/.config/nvim/init.lua b/neovim/.config/nvim/init.lua
index 67adca4..f6196ea 100644
--- a/neovim/.config/nvim/init.lua
+++ b/neovim/.config/nvim/init.lua
@@ -81,6 +81,7 @@ require("packer").startup(function(use)
       { "hrsh7th/cmp-buffer" },
       { "hrsh7th/cmp-path" },
       { "hrsh7th/cmp-cmdline" },
+      { "petertriho/cmp-git" },
     },
   })
   use({ "L3MON4D3/LuaSnip", {
diff --git a/neovim/.config/nvim/lua/user/comp.lua b/neovim/.config/nvim/lua/user/comp.lua
index 819efcd..5b71328 100644
--- a/neovim/.config/nvim/lua/user/comp.lua
+++ b/neovim/.config/nvim/lua/user/comp.lua
@@ -96,13 +96,25 @@ cmp.setup({
 })
 
 cmp.setup.cmdline("/", {
+  mapping = cmp.mapping.preset.cmdline(),
   sources = {
-    { name = "cmdline" },
+    { name = "buffer" },
   },
 })
 
 cmp.setup.cmdline(":", {
-  sources = {
+  mapping = cmp.mapping.preset.cmdline(),
+  sources = cmp.config.sources({
+    { name = "path" },
+  }, {
     { name = "cmdline" },
-  },
+  }),
+})
+
+cmp.setup.filetype("gitcommit", {
+  sources = cmp.config.sources({
+    { name = "cmp_git" },
+  }, {
+    { name = "buffer" },
+  }),
 })