mirror of
https://github.com/zoriya/jj.nvim.git
synced 2026-08-15 23:53:18 +00:00
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:
+8
-2
@@ -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>" },
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user