Git Diff Merge Integration

Git can be configured to use Guiffy as its diff and merge tool. The paths shown below assume Guiffy is installed in the default location for each operating system. Git can be configured by editing your .gitconfig file or by using git config commands.

On Windows

Add the following to your .gitconfig file:

[diff]
	tool = guiffy
[difftool "guiffy"]
	cmd = "\"C:/Program Files/Guiffy/guiffy.exe\" \"$LOCAL\" \"$REMOTE\""
[difftool]
	prompt = false
[merge]
	tool = guiffy
[mergetool "guiffy"]
	cmd = "\"C:/Program Files/Guiffy/guiffy.exe\" -s \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
	trustExitCode = true

Or use the following git config commands:

git config --global diff.tool guiffy
git config --global difftool.guiffy.cmd "\"C:/Program Files/Guiffy/guiffy.exe\" \"$LOCAL\" \"$REMOTE\""
git config --global difftool.prompt false
git config --global merge.tool guiffy
git config --global mergetool.guiffy.cmd "\"C:/Program Files/Guiffy/guiffy.exe\" -s \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
git config --global mergetool.guiffy.trustExitCode true

On Linux/Unix

Add the following to your .gitconfig file:

[diff]
	tool = guiffy
[difftool "guiffy"]
	cmd = "\"/usr/local/bin/Guiffy/guiffy\" \"$LOCAL\" \"$REMOTE\""
[difftool]
	prompt = false
[merge]
	tool = guiffy
[mergetool "guiffy"]
	cmd = "\"/usr/local/bin/Guiffy/guiffy\" -s \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
	trustExitCode = true

Or use the following git config commands:

git config --global diff.tool guiffy
git config --global difftool.guiffy.cmd "\"/usr/local/bin/Guiffy/guiffy\" \"$LOCAL\" \"$REMOTE\""
git config --global difftool.prompt false
git config --global merge.tool guiffy
git config --global mergetool.guiffy.cmd "\"/usr/local/bin/Guiffy/guiffy\" -s \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
git config --global mergetool.guiffy.trustExitCode true

On MacOS X

Add the following to your .gitconfig file:

[diff]
	tool = guiffy
[difftool "guiffy"]
	cmd = "\"/Applications/Guiffy/guiffyCL.command\" \"$LOCAL\" \"$REMOTE\""
[difftool]
	prompt = false
[merge]
	tool = guiffy
[mergetool "guiffy"]
	cmd = "\"/Applications/Guiffy/guiffyCL.command\" -s \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
	trustExitCode = true

Or use the following git config commands:

git config --global diff.tool guiffy
git config --global difftool.guiffy.cmd "\"/Applications/Guiffy/guiffyCL.command\" \"$LOCAL\" \"$REMOTE\""
git config --global difftool.prompt false
git config --global merge.tool guiffy
git config --global mergetool.guiffy.cmd "\"/Applications/Guiffy/guiffyCL.command\" -s \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
git config --global mergetool.guiffy.trustExitCode true


Documentation by Guiffy Software, Inc. 2018