From 2472bedbec270621a4693594d15203acfc8929de Mon Sep 17 00:00:00 2001 From: Ruslan Date: Thu, 29 Jan 2026 10:24:52 +0200 Subject: [PATCH] fugitive: remove push map, update pull map --- lua/crentist/lazy/fugitive.lua | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lua/crentist/lazy/fugitive.lua b/lua/crentist/lazy/fugitive.lua index f799dfb..7833ba7 100644 --- a/lua/crentist/lazy/fugitive.lua +++ b/lua/crentist/lazy/fugitive.lua @@ -2,7 +2,7 @@ return { 'tpope/vim-fugitive', config = function() vim.keymap.set('n', "gs", vim.cmd.Git) - vim.keymap.set('n', "gl", function () vim.cmd.Git({ 'pull' }) end) + vim.keymap.set('n', "gl", function() vim.cmd.Git({ 'pull' }) end) vim.api.nvim_create_user_command('Gcm', function() vim.cmd.Git({ 'switch main' }) end, {}) @@ -19,13 +19,9 @@ return { local SwitchToMainbufnr = vim.api.nvim_get_current_buf() local opts = { buffer = bufnr, remap = false } - vim.keymap.set('n', "p", function() - vim.cmd.Git('push') - end, opts) - -- rebase always - vim.keymap.set('n', "P", function() - vim.cmd.Git({ 'pull', '--rebase' }) + vim.keymap.set('n', "pu", function() + vim.cmd.Git({ 'pull --rebase origin main' }) end, opts) end, })