Skip to content

Instantly share code, notes, and snippets.

@orlissenberg

orlissenberg/gist:7125064

Created October 23, 2013 19:28
Show Gist options
  • Save orlissenberg/7125064 to your computer and use it in GitHub Desktop.
Save orlissenberg/7125064 to your computer and use it in GitHub Desktop.
Download ZIP
Configure Kaleidoscope as the GIT difftool on the terminal.
Raw
gistfile1.txt
------------------------------------
.git/config
------------------------------------
[diff]
tool = ksdiff
[difftool "ksdiff"]
cmd = ksdiff \"$LOCAL\" \"$REMOTE\"
------------------------------------
Configuration via commandline
------------------------------------
git config diff.tool ksdiff
git config difftool.ksdiff.cmd 'ksdiff "$LOCAL" "$REMOTE"'
(add --global for all git repositories)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment