sloanelybutsurely/dotfiles
1
0
Fork 0
Code Issues Pull requests Activity

add master git bindings jic they're needed

Browse source
This commit is contained in:
Sloane Perrault 2023-08-29 12:25:43 -04:00
parent 7dd64ab40d
commit 1f3712f4c9
No known key found for this signature in database
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.config/nvim/lua/keys.lua
View file

@ -66,17 +66,14 @@ wk.register({
s = { '<cmd>Git<cr>', 'Status' }, s = { '<cmd>Git<cr>', 'Status' },
p = { '<cmd>Git push -u origin head<cr>', 'Push' }, p = { '<cmd>Git push -u origin head<cr>', 'Push' },
P = { '<cmd>Git push -u origin head --force-with-lease<cr>', 'Push (force with lease)' }, P = { '<cmd>Git push -u origin head --force-with-lease<cr>', 'Push (force with lease)' },
f = { f = { '<cmd>Git fetch<cr>', 'Fetch' },
name = 'fetch',
o = { '<cmd>Git fetch origin<cr>', 'origin' },
u = { '<cmd>Git fetch upstream<cr>', 'upstream' },
},
r = { r = {
name = 'rebase', name = 'rebase',
o = { '<cmd>Git rebase origin/main<cr>', 'origin/main' }, o = { '<cmd>Git rebase origin/main<cr>', 'origin/main' },
O = { '<cmd>Git rebase --interactive origin/main<cr>', '-i origin/main' }, O = { '<cmd>Git rebase --interactive origin/main<cr>', '-i origin/main' },
u = { '<cmd>Git rebase upstream/main<cr>', 'upstream/main' }, m = { '<cmd>Git rebase origin/master<cr>', 'origin/master' },
U = { '<cmd>Git rebase --interactive upstream/main<cr>', '-i upstream/main' }, M = { '<cmd>Git rebase --interactive origin/master<cr>', '-i origin/master' },
r = { '<cmd>Git rebase ', 'rebase ...' },
} }
}, },
@ -110,8 +107,8 @@ vim.api.nvim_create_autocmd('LspAttach', {
-- vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts) -- vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
-- vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts) -- vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts) vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
-- vim.keymap.set('n', '<space>f', function() vim.keymap.set('n', '<leader>F', function()
-- vim.lsp.buf.format { async = true } vim.lsp.buf.format { async = true }
-- end, opts) end, opts)
end, end,
}) })