Skip to content

refactor: show default git commands in interactive rebase template #1804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: show default git commands in interactive rebase template #1804

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 30 additions & 8 deletions lua/neogit/buffers/rebase_editor/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,21 +92,43 @@ 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")),
("%s %s move the commit up"):format(comment_char, pad_mapping("MoveUp")),
("%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 <commit> = use commit"):format(comment_char),
("%s r, reword <commit> = use commit, but edit the commit message"):format(comment_char),
("%s e, edit <commit> = use commit, but stop for amending"):format(comment_char),
("%s s, squash <commit> = use commit, but meld into previous commit"):format(comment_char),
('%s f, fixup [-C | -c] <commit> = 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 <command> = 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 <commit> = remove commit"):format(comment_char),
("%s l, label <label> = label current HEAD with a name"):format(comment_char),
("%s t, reset <label> = reset HEAD to a label"):format(comment_char),
("%s m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]"):format(comment_char),
("%s create a merge commit using the original merge commit's"):format(comment_char),
("%s message (or the oneline, if no original merge commit was"):format(comment_char),
("%s specified); use -c <commit> to reword the commit message"):format(comment_char),
("%s u, update-ref <ref> = track a placeholder for the <ref> to be updated"):format(comment_char),
("%s to this position in the new commits. The <ref> is"):format(comment_char),
("%s updated at the end of the rebase"):format(comment_char),
("%s"):format(comment_char),
("%s These lines can be re-ordered; they are executed from top to bottom."):format(comment_char),
("%s"):format(comment_char),
("%s If you remove a line here THAT COMMIT WILL BE LOST."):format(comment_char),
Expand Down