Skip to content

Instantly share code, notes, and snippets.

@joelpittet

joelpittet/.gitconfig

Created March 12, 2015 19:15
Show Gist options
  • Save joelpittet/66ee0fbbd045b1eaa321 to your computer and use it in GitHub Desktop.
Save joelpittet/66ee0fbbd045b1eaa321 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. joelpittet created this gist Mar 12, 2015.
    15 changes: 15 additions & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,15 @@
    # 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