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

feat(git/config): add mergiraf

Browse Source
This commit is contained in:
Jim Myhrberg
2025-07-07 10:24:08 +01:00
parent 525fe77e62
commit 60cf0d1e33
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Brewfile
View File

@@ -37,6 +37,7 @@ brew 'libyaml'
brew 'logrotate' brew 'logrotate'
brew 'make' brew 'make'
brew 'mas' brew 'mas'
brew 'mergiraf'
brew 'mosh' brew 'mosh'
brew 'node' brew 'node'
brew 'pandoc' brew 'pandoc'

1
gitattributes Normal file
View File

@@ -0,0 +1 @@
merge=mergiraf

8
gitconfig
View File

@@ -7,6 +7,7 @@
[tag] [tag]
gpgsign = true gpgsign = true
[core] [core]
attributesfile = ~/.gitattributes
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
[color] [color]
status = auto status = auto
@@ -76,13 +77,12 @@
[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] [merge "mergiraf"]
tool = Kaleidoscope name = mergiraf
driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L
[mergetool "Kaleidoscope"] [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]
prompt = false
[gitbutler] [gitbutler]
aiModelProvider = anthropic aiModelProvider = anthropic
aiAnthropicKeyOption = bringYourOwn aiAnthropicKeyOption = bringYourOwn

1
install.sh
View File

@@ -26,6 +26,7 @@ SYMLINKS=(
config/k9s config/k9s
erlang erlang
gemrc gemrc
gitattributes
gitconfig gitconfig
gitignore gitignore
hammerspoon hammerspoon