Git Diff Merge Integration

Git can be configured to use Guiffy as its diff and merge tool.

Git Diff Tool Integration

To use Guiffy for diff operations, add the following to your .gitconfig file:

[diff]
    tool = guiffy
[difftool "guiffy"]
    cmd = "\"C:/Program Files/Guiffy115/guiffy.exe\" \"$LOCAL\" \"$REMOTE\""

Git Merge Tool Integration

To use Guiffy for merge operations, add the following to your .gitconfig file:

[merge]
    tool = suremerge
[mergetool "suremerge"]
    cmd = "\"C:/Program Files/Guiffy115/guiffy.exe\" -s \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
    keepBackup = false
    trustExitCode = false

NOTE: The above "cmd" variables are for Guiffy on Windows.
To use Guiffy for diff operations on MacOS X, the cmd variable would be:

    cmd = "\"Applications/Guiffy115/guiffyCL.command\" \"$LOCAL\" \"$REMOTE\""
To use Guiffy for merge operations on MacOS X, the cmd variable would be:

    cmd = "\"Applications/Guiffy115/guiffyCL.command\" -s \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""


To use Guiffy for diff operations on Linux or Unix, the cmd variable would be something like:

    cmd = "\"sh /home/billri/Guiffy115/guiffy\" \"$LOCAL\" \"$REMOTE\""
To use Guiffy for merge operations on Linux or Unix, the cmd variable would be something like:

    cmd = "\"sh /home/billri/Guiffy115/guiffy\" -s \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
Documentation by Guiffy Software, Inc. 2016