dot/mac
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Configure Kaleidoscope.app as default Git diff/merge tool when on MacOS platform

Browse source
This commit is contained in:
Danielle McLean 2016-11-19 19:08:39 +11:00
parent b71ccdf1f4
commit a915289a41
No known key found for this signature in database
GPG key ID: CC91589719027E94
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/git/config.os Normal file
View file

@ -0,0 +1,3 @@
# vim: ft=gitconfig
[include]
path = tools/ksdiff

14
config/git/tools/ksdiff Normal file
View file

@ -0,0 +1,14 @@
# vim: ft=gitconfig
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[merge]
tool = Kaleidoscope
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[mergetool]
prompt = false
[diff]
tool = Kaleidoscope