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

Add jj hunk squash

Browse Source
This commit is contained in:
zoriya
2026-08-15 15:04:24 +02:00
parent d76028d25b
commit 1365fa8f26
5 changed files with 148 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nvim/lua/plugins/git.lua
+4 -1
View File
@@ -36,7 +36,7 @@ return {
require("mini.diff").gen_source.git(),
},
mappings = {
apply = "",
apply = "gh",
reset = "gH",
textobject = "ih",
goto_first = "[H",
@@ -53,6 +53,9 @@ return {
vim.keymap.set("n", "<leader>hr", "gHih", { remap = true, desc = "Reset Hunk" })
vim.keymap.set("x", "<leader>hr", "gH", { remap = true, desc = "Reset Hunk" })
vim.keymap.set("n", "<leader>hs", "ghih", { remap = true, desc = "Squash Hunk" })
vim.keymap.set("x", "<leader>hs", "gh", { remap = true, desc = "Squash Hunk" })
vim.keymap.set("n", "<leader>hp", function() diff.toggle_overlay(0) end, { desc = "Preview Hunk (overlay)" })
vim.keymap.set("n", "<leader>gR", function() diff.do_hunks(0, "reset") end, { desc = "Reset Buffer" })
end,