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

Use difftastic for git

Browse Source
This commit is contained in:
Dan Barber 2024-03-23 19:26:39 -05:00
parent 9ef7a2cef9
commit 80f3cdae73
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gitconfig.local
View File

@ -12,9 +12,16 @@
clean = git-lfs clean %f clean = git-lfs clean %f
smudge = git-lfs smudge %f smudge = git-lfs smudge %f
[diff] [diff]
tool = Kaleidoscope external = difft
tool = difftastic
[difftool]
prompt = false
[difftool "Kaleidoscope"] [difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[pager]
difftool = true
[alias] [alias]
ksdiff = difftool -yt Kaleidoscope ksdiff = difftool -yt Kaleidoscope
[tig] [tig]