diff --git a/lua/neogit/buffers/rebase_editor/init.lua b/lua/neogit/buffers/rebase_editor/init.lua index 10149c304..ef866a512 100644 --- a/lua/neogit/buffers/rebase_editor/init.lua +++ b/lua/neogit/buffers/rebase_editor/init.lua @@ -92,14 +92,14 @@ function M:open(kind) -- stylua: ignore local help_lines = { - ("%s Commands:"):format(comment_char), - ("%s %s pick = use commit"):format(comment_char, pad_mapping("Pick")), - ("%s %s reword = use commit, but edit the commit message"):format(comment_char, pad_mapping("Reword")), - ("%s %s edit = use commit, but stop for amending"):format(comment_char, pad_mapping("Edit")), - ("%s %s squash = use commit, but meld into previous commit"):format(comment_char, pad_mapping("Squash")), - ('%s %s fixup = like "squash", but discard this commit\'s log message'):format(comment_char, pad_mapping("Fixup")), - ("%s %s exec = run command (the rest of the line) using shell"):format(comment_char, pad_mapping("Execute")), - ("%s %s drop = remove commit"):format(comment_char, pad_mapping("Drop")), + ("%s Keybinds:"):format(comment_char), + ("%s %s pick"):format(comment_char, pad_mapping("Pick")), + ("%s %s reword"):format(comment_char, pad_mapping("Reword")), + ("%s %s edit"):format(comment_char, pad_mapping("Edit")), + ("%s %s squash"):format(comment_char, pad_mapping("Squash")), + ("%s %s fixup"):format(comment_char, pad_mapping("Fixup")), + ("%s %s exec"):format(comment_char, pad_mapping("Execute")), + ("%s %s drop"):format(comment_char, pad_mapping("Drop")), ("%s %s undo last change"):format(comment_char, pad("u", padding)), ("%s %s tell Git to make it happen"):format(comment_char, pad_mapping("Submit")), ("%s %s tell Git that you changed your mind, i.e. abort"):format(comment_char, pad_mapping("Abort")), @@ -107,6 +107,28 @@ function M:open(kind) ("%s %s move the commit down"):format(comment_char, pad_mapping("MoveDown")), ("%s %s show the commit another buffer"):format(comment_char, pad_mapping("OpenCommit")), ("%s"):format(comment_char), + ("%s Commands:"):format(comment_char), + ("%s p, pick = use commit"):format(comment_char), + ("%s r, reword = use commit, but edit the commit message"):format(comment_char), + ("%s e, edit = use commit, but stop for amending"):format(comment_char), + ("%s s, squash = use commit, but meld into previous commit"):format(comment_char), + ('%s f, fixup [-C | -c] = like "squash", but discard this commit\'s log message'):format(comment_char), + ("%s commit's log message, unless -C is used, in which case"):format(comment_char), + ("%s keep only this commit's message; -c is same as -C but"):format(comment_char), + ("%s opens the editor"):format(comment_char), + ("%s x, exec = run command (the rest of the line) using shell"):format(comment_char), + ("%s b, break = stop here (continue rebase later with 'git rebase --continue')"):format(comment_char), + ("%s d, drop = remove commit"):format(comment_char), + ("%s l, label