dev. » git http://coliena.com/blog some software engineers' random rants and thoughts Mon, 30 Aug 2010 20:02:16 +0000 en hourly 1 http://wordpress.org/?v=3.0.1 Using WinMerge with git on Windows 7 http://coliena.com/blog/2009/11/using-winmerge-with-git-on-windows-7/ http://coliena.com/blog/2009/11/using-winmerge-with-git-on-windows-7/#comments Sat, 28 Nov 2009 13:03:56 +0000 niels http://coliena.com/blog/?p=199 Though git is not my primary source code management tool, I use it whenever I work on complex code that I don’t want to commit yet. Or just to keep track of my local scripts.
And using “git difftool”, it is pretty simple to use third party tools like WinMerge for graphical diffs:

  1. Create a wrapper script (e.g. git-diff-wrapper.sh) and put it anywhere in your Windows path (%PATH%):
    #!/bin/sh
    "C:/Program Files/WinMerge/WinMergeU.exe" -e -ub "$1" "$2" | cat
  2. Update your .gitconfig to run this script whenever “git difftool” is invoked:
    # … more config …
    [diff]
    tool = winmerge
    [difftool "winmerge"]
    cmd = git-diff-wrapper.sh "$LOCAL" "$REMOTE"
    # … more config …

That’s it, no restart required ;)

]]> http://coliena.com/blog/2009/11/using-winmerge-with-git-on-windows-7/feed/ 1