A Tasty Pixel ยป Blog » Textmate http://atastypixel.com/blog Wed, 01 Sep 2010 22:10:04 +0000 en hourly 1 Textmate: ‘git diff’ in FileMerge http://atastypixel.com/blog/textmate-git-diff-in-filemerge/ http://atastypixel.com/blog/textmate-git-diff-in-filemerge/#comments Mon, 04 Jan 2010 18:50:01 +0000 Michael http://atastypixel.com/blog/2010/01/04/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.

]]> http://atastypixel.com/blog/textmate-git-diff-in-filemerge/feed/ 2