move other dir to os_and_install
asd
This commit is contained in:
1 parent
dbb8eda1e6
commit
9a476ef5cd
10 files changed
+84
No files matched your search
@@ -0,0 +1,23 @@
|
||||
os:
|
||||
#edit: "/usr/bin/subl" # or "vim", "code", "nano", etc.
|
||||
edit: "vim {{filename}}"
|
||||
editAtLine: "vim +{{line}} {{filename}}"
|
||||
gui:
|
||||
mouseEvents: false
|
||||
customCommands:
|
||||
- key: <c-r>
|
||||
context: "localBranches"
|
||||
description: "Rebase current branch onto selected branch using theirs"
|
||||
prompts:
|
||||
- type: "confirm"
|
||||
title: "Confirm rebase"
|
||||
body: "Rebase current branch onto '{{.SelectedLocalBranch.Name}}' using -X theirs?\nThis will prefer THEIR changes on conflicts."
|
||||
command: "git rebase {{.SelectedLocalBranch.Name}} -X theirs"
|
||||
keybinding:
|
||||
universal:
|
||||
# Set tabs to arrow keys
|
||||
nextTab: '<right>'
|
||||
prevTab: '<left>'
|
||||
# Move panel navigation to H and L
|
||||
nextBlock: 'l'
|
||||
prevBlock: 'h'
|
||||
Reference in new issue
Block a user