From 3d86e373cf79a58b9d8668ac4cd6ef2d043a58d9 Mon Sep 17 00:00:00 2001 From: Chen Asraf Date: Tue, 6 Jun 2023 15:40:13 +0300 Subject: [PATCH] feat: update keymaps + aliases --- .config/nvim/after/plugin/lsp.lua | 2 +- plugins/git.plugin.zsh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua index 4ca3211e..c943fa18 100644 --- a/.config/nvim/after/plugin/lsp.lua +++ b/.config/nvim/after/plugin/lsp.lua @@ -55,7 +55,7 @@ lsp.on_attach(function(client, bufnr) buffer = bufnr, remap = false }) - vim.keymap.set("n", "gd", function() vim.diagnostic.open_float() end, { + vim.keymap.set("n", "gD", function() vim.diagnostic.open_float() end, { desc = "Open diagnostics", buffer = bufnr, remap = false diff --git a/plugins/git.plugin.zsh b/plugins/git.plugin.zsh index 3c8d53c8..a3bee58b 100644 --- a/plugins/git.plugin.zsh +++ b/plugins/git.plugin.zsh @@ -230,6 +230,7 @@ alias glola="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgr alias glog='git log --oneline --decorate --graph' alias gloga='git log --oneline --decorate --graph --all' alias glp="_git_log_prettily" +alias gls="git ls-files" alias gm='git merge' alias gmom='git merge origin/$(git_main_branch)'