Gitfox

Support How do I change my Difftool?

Gitfox emulates the git difftool command and automatically uses the default difftool that is specified in your git config.

Built-In

Gitfox has defaults built in for the following difftools, that are used if there is not an explicit command configured for it:

  • araxis
  • opendiff
  • filemerge

You can specify them like so

[merge]
tool = <toolname>
[diff]
tool = <toolname>

Other

For any other difftool, Gitfox uses the specified command. For e.g. Kaleidoscope this would look like this.

[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[merge]
tool = Kaleidoscope
[diff]
tool = Kaleidoscope

Usually you don’t have to do this yourself, since most tools provide integration themselves.