zoriya/flake
1
0
Fork 0
mirror of https://github.com/zoriya/flake.git synced 2026-08-15 18:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix githunk & fugitive conflicts

Browse Source
This commit is contained in:
zoriya
2025-01-10 23:08:56 +01:00
parent 37de1a65b3
commit 09e97bb22e
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nvim/lua/plugins/git.lua
+13 -5
View File
@@ -1,3 +1,11 @@
-- fugitive keybinds
vim.keymap.set("n", "<leader>gA", "<cmd>Git add -A<CR>", { desc = "Git add all" })
vim.keymap.set("n", "<leader>gc", "<cmd>Git commit<CR>", { desc = "Git commit" })
vim.keymap.set("n", "<leader>gC", "<cmd>Git commit --amend<CR>", { desc = "Git commit amend" })
vim.keymap.set("n", "<leader>gp", "<cmd>Git! push<CR>", { desc = "Git push" })
vim.keymap.set("n", "<leader>gP", "<cmd>Git! push --force-with-lease --force-if-includes<CR>", { desc = "Git push force" })
return {
{
"gitsigns.nvim",
@@ -23,12 +31,12 @@ return {
map('n', ']h', function() gs.nav_hunk('next') end, "Next Hunk")
map('n', '[h', function() gs.nav_hunk('prev') end, "Prev Hunk")
map({ "n", "v" }, "<leader>ga", ":Gitsigns stage_hunk<CR>", "Add Hunk")
map({ "n", "v" }, "<leader>gr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
map("n", "<leader>gu", gs.undo_stage_hunk, "Unstage Hunk")
map("n", "<leader>gA", gs.stage_buffer, "Add buffer")
map({ "n", "v" }, "<leader>ha", ":Gitsigns stage_hunk<CR>", "Add Hunk")
map({ "n", "v" }, "<leader>hr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
map("n", "<leader>hu", gs.undo_stage_hunk, "Unstage Hunk")
map("n", "<leader>ga", gs.stage_buffer, "Add buffer")
map("n", "<leader>gR", gs.reset_buffer, "Reset Buffer")
map("n", "<leader>gp", gs.preview_hunk, "Preview Hunk")
map("n", "<leader>hp", gs.preview_hunk, "Preview Hunk")
map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", "Git Select Hunk")
map({ "o", "x" }, "ah", ":<C-U>Gitsigns select_hunk<CR>", "Git Select Hunk")
end,
nvim/lua/plugins/telescope.lua
-7
View File
@@ -11,13 +11,6 @@ return {
{ "<leader>gB", "<cmd>Telescope git_branches<CR>", desc = "Git branches" },
{ "<leader>gs", "<cmd>Telescope git_status<CR>", desc = "Git status" },
{ "<leader>zh", "<cmd>Telescope help_tags<CR>", desc = "Read help" },
-- maybe i should move those elsewhere
{ "<leader>g.", "<cmd>Git add -A<CR>", desc = "Git add all" },
{ "<leader>gc", "<cmd>Git commit<CR>", desc = "Git commit" },
{ "<leader>gC", "<cmd>Git commit --amend<CR>", desc = "Git commit amend" },
{ "<leader>gp", "<cmd>Git! push<CR>", desc = "Git push" },
{ "<leader>gP", "<cmd>Git! push --force-with-lease --force-if-includes<CR>", desc = "Git push force" },
},
after = function()
local actions = require("telescope.actions")