lelgenio/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 2 Releases Packages Wiki Activity Actions

kakoune: add shortcut to keep new and head in merge

Browse source
This commit is contained in:
lelgenio 2024-06-21 15:08:44 -03:00
parent 83d268e422
commit 6b85e09715
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
user/kakoune/git-mode.kak
View file

@ -32,6 +32,7 @@ map global git 'N' ': git-next-merge-conflict <ret>' -docstring 'next git me
map global git 'P' ': git-prev-merge-conflict <ret>' -docstring 'previous git merge conflict'
map global git 'm' ': git-merge-head <ret>' -docstring 'merge using head'
map global git 'M' ': git-merge-new <ret>' -docstring 'merge using new'
map global git '<c-m>' ': git-merge-head-and-new <ret>' -docstring 'merge using both head and new'
map global git '<a-m>' ': git-merge-original <ret>' -docstring 'merge using original'
define-command -override git-next-merge-conflict %{
@ -92,6 +93,19 @@ define-command -override git-merge-new %{
}
} -docstring "merge using new"
define-command -override git-merge-head-and-new %{
evaluate-commands -draft %{
# delete head marker
execute-keys <a-/>^<lt>{4,}<ret>xd
# select middle of conflict
execute-keys /^[|]{4,}<ret>x
# extendo to theirs marker
execute-keys ?^={4,}<ret>xd
# delete end marker
execute-keys /^<gt>{4,}<ret>xd
}
} -docstring "merge using head and new"
define-command -override git-graph %{
try %{ delete-buffer '*git-graph*' }
edit -scratch '*git-graph*'