feat(log): add immutable-ignoring rebase keymaps

Changes add support for rebasing while ignoring immutability constraints with new keymaps (<S-CR>, <S-o>, <S-a>, <S-b>) and update documentation. Refactors rebase handler to accept optional ignore_immut parameter and includes minor comment improvements in buffer and command modules.
This commit is contained in:
NicolasGB
2026-01-06 13:20:19 +01:00
committed by Nicolas GB
parent ca75a50858
commit ba48ed08b5
4 changed files with 59 additions and 12 deletions
+8 -2
View File
@@ -52,6 +52,9 @@ local status_module = require("jj.cmd.status")
--- @field onto? string|string[]
--- @field after? string|string[]
--- @field before? string|string[]
--- @field onto_immutable? string|string[]
--- @field after_immutable? string|string[]
--- @field before_immutable? string|string[]
--- @field exit_mode? string|string[]
--- @class jj.cmd.bookmark
@@ -128,8 +131,11 @@ M.config = {
rebase = "r",
rebase_mode = {
onto = { "<CR>", "o" },
after = { "a", "A" },
before = { "b", "B" },
after = "a",
before = "b",
onto_immutable = { "<S-CR>", "<S-o>" },
after_immutable = "<S-a>",
before_immutable = "<S-b>",
exit_mode = { "<Esc>", "<C-c>" },
},
},