Blog

Textmate: ‘git diff’ in FileMerge

I found myself wanting to pick through some changes I made under a git repository recently, discarding some and adapting others. The FileMerge utility that comes with the Mac OS X Developer Tools is great for this purpose, but in TextMate, there’s currently no way to compare uncommitted changes in a git repository using FileMerge.

Now there is!

View Uncommitted Changes in FileMerge.tmCommand.zip

Double click to install it in Textmate; it appears under the ‘Git’ bundle. I suggest you then select the ‘Git’ bundle group header, and drag this command (‘View Uncommitted Changes in FileMerge‘) up to the top of the menu list on the right, so it’s accessible via Control-Shift-G, 1.

It’s based on filemerge.tmbundle.

, . Bookmark the permalink. Both comments and trackbacks are currently closed.

2 Comments

  1. Pascal
    Posted February 20, 2010 at 12:31 pm | Permalink

    Hey Michael,

    Thanks for this useful script. Fits well in my workflow!

    • Pascal

    PS: There exists a tiny cmdline tool for generating ‘save’ temp file locations: e.g.: $ mktemp /tmp/tm-opendiff-XXXXXX

  2. Posted April 12, 2010 at 2:17 pm | Permalink

    whow!! thanks

    i’v been searching for this script since i move from svn to git. :D nice! works well on my leopard. althogh, i have to edit git path on the command from :

    git 
    to
    /opt/local/bin/git
    since i installed it via mac port.

    thanks!