From 74b2724adc7a711934d6c1adec6cf2ac4d44e974 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Fri, 31 Jul 2026 19:19:50 +0200 Subject: [PATCH] Fix hunk reset --- nvim/lua/plugins/git.lua | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/nvim/lua/plugins/git.lua b/nvim/lua/plugins/git.lua index eb19e0c..1b0a5cc 100644 --- a/nvim/lua/plugins/git.lua +++ b/nvim/lua/plugins/git.lua @@ -50,20 +50,11 @@ return { diff.setup(plug.opts) require("jj-diff").setup() - local function map(mode, l, r, desc) - vim.keymap.set(mode, l, r, { desc = desc }) - end + vim.keymap.set("n", "hr", "gHih", { remap = true, desc = "Reset Hunk" }) + vim.keymap.set("x", "hr", "gH", { remap = true, desc = "Reset Hunk" }) - map("n", "hr", function() - local line = vim.fn.line(".") - diff.do_hunks(0, "reset", { line_start = line, line_end = line }) - end, "Reset Hunk") - map("x", "hr", function() - diff.do_hunks(0, "reset", { line_start = vim.fn.line("v"), line_end = vim.fn.line(".") }) - end, "Reset Hunk") - - map("n", "hp", function() diff.toggle_overlay(0) end, "Preview Hunk (overlay)") - map("n", "gR", function() diff.do_hunks(0, "reset") end, "Reset Buffer") + vim.keymap.set("n", "hp", function() diff.toggle_overlay(0) end, { desc = "Preview Hunk (overlay)" }) + vim.keymap.set("n", "gR", function() diff.do_hunks(0, "reset") end, { desc = "Reset Buffer" }) end, },