danbarber/dotfiles-local
1
0
Fork 0
mirror of https://github.com/danbee/dotfiles-local synced 2025-03-04 08:49:07 +00:00
Code Issues Releases Wiki Activity

Add Kaleidoscope as a diff tool

Browse Source
This commit is contained in:
Daniel Barber 2017-12-07 14:41:04 -05:00
parent a6c52c68a6
commit 1c659875c8
Signed by: danbarber
GPG Key ID: 931D8112E0103DD8
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gitconfig.local
View File

@ -6,3 +6,9 @@
required = true required = true
clean = git-lfs clean %f clean = git-lfs clean %f
smudge = git-lfs smudge %f smudge = git-lfs smudge %f
[diff]
tool = Kaleidoscope
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[alias]
ksdiff = difftool -yt Kaleidoscope