2023-08-24 11:54:45 +00:00
|
|
|
---@type MappingsTable
|
|
|
|
|
local M = {}
|
|
|
|
|
|
|
|
|
|
M.general = {
|
|
|
|
|
n = {
|
|
|
|
|
[";"] = { ":", "enter command mode", opts = { nowait = true } },
|
|
|
|
|
["<leader>gr"] = { "<cmd> Gitsigns reset_hunk <CR>", "Reset hunk" },
|
|
|
|
|
["<leader>gp"] = { "<cmd> Gitsigns preview_hunk <CR>", "See preview hunk" },
|
|
|
|
|
["<leader>gd"] = { "<cmd> Gitsigns diffthis <CR>", "See diff" },
|
2023-09-13 08:14:09 +00:00
|
|
|
["<leader>gco"] = { "<cmd> GitConflictChooseOurs <CR>", "Git conflict ours" },
|
|
|
|
|
["<leader>gct"] = { "<cmd> GitConflictChooseTheirs <CR>", "Git conflict theirs" },
|
|
|
|
|
["<leader>gcb"] = { "<cmd> GitConflictChooseBoth <CR>", "Git conflict both" },
|
|
|
|
|
["<leader>gc0"] = { "<cmd> GitConflictChooseNone <CR>", "Git conflict none" },
|
|
|
|
|
["<leader>gcp"] = { "<cmd> GitConflictPrevConflict <CR>", "Git conflict preview conflict" },
|
|
|
|
|
["<leader>gcn"] = { "<cmd> GitConflictNextConflict <CR>", "Git conflict next conflict" };
|
2023-08-24 11:54:45 +00:00
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-- more keybinds!
|
|
|
|
|
|
|
|
|
|
return M
|
