Skip to content

Instantly share code, notes, and snippets.

@awesome

awesome/.gitconfig

Forked from joelpittet/.gitconfig
Created February 23, 2023 00:06
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save awesome/7ab35c8d228fc0eb33e3e4b6c4505759 to your computer and use it in GitHub Desktop.
Save awesome/7ab35c8d228fc0eb33e3e4b6c4505759 to your computer and use it in GitHub Desktop.
Download ZIP
kaleidoscope git mergetool config
Raw
.gitconfig
# Kaleidoscope.app as difftool and mergetool.
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
keepBackup = false
[merge]
tool = Kaleidoscope
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment