jimeh/dotfiles
1
0
Fork 0
mirror of https://github.com/jimeh/dotfiles.git synced 2026-02-19 13:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(gitconfig): update Kaleidoscope related settings

Browse Source
This commit is contained in:
Jim Myhrberg
2025-04-13 13:54:12 +01:00
parent 6e6755231c
commit 4551336767
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gitconfig
View File

@@ -42,7 +42,7 @@
[pull] [pull]
rebase = true rebase = true
[difftool "Kaleidoscope"] [difftool "Kaleidoscope"]
cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\" cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool] [difftool]
prompt = false prompt = false
[diff] [diff]
@@ -76,6 +76,13 @@
[credential "https://gist.github.com"] [credential "https://gist.github.com"]
helper = helper =
helper = !op plugin run -- gh auth git-credential helper = !op plugin run -- gh auth git-credential
[merge]
tool = Kaleidoscope
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
[gitbutler] [gitbutler]
aiModelProvider = anthropic aiModelProvider = anthropic
aiAnthropicKeyOption = bringYourOwn aiAnthropicKeyOption = bringYourOwn