kogakure/dotfiles
1
1
Fork 0
mirror of https://github.com/kogakure/dotfiles.git synced 2026-02-03 20:25:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(karabiner): add karabiner config to dotfiles

Browse Source
This commit is contained in:
Stefan Imhoff
2022-11-12 13:59:40 +01:00
parent f503e0ab6f
commit ad21ff00bc
5 changed files with 512 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gitconfig
View File

@@ -88,7 +88,7 @@
[difftool]
prompt = false
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[merge]
conflictstyle = diff3
tool = Kaleidoscope
@@ -96,8 +96,9 @@
prompt = false
keepBackup = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
trustExitCode = true
[mergetool "nvim"]
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
[mergetool "code"]