About This
I am Michael Tyson, and I run A Tasty Pixel. I write on a variety of technology and software development topics as I travel around Europe in a motorhome.
-
Subscribe to updates 489 feed subscribers
Follow me on Twitter 964 followers
Our Products
Newsletter
Let us keep you informed about important updates, special offers, and new products. Just type in your email address below and hit enter to sign up!
-
Recent Posts
Topics
Audio Business Career Cocoa Code Data Debugging Demo Design Development Google Graphics Interface iPad iPhone Lifestyle Links Location Loopy Loopy HD Mac Maps Marketing Networking Optimisation PHP Scripts Security Shell Social Comment Software Talkie Talkie-for-Mac The Cartographer Travel Tutorial Twitter Update Utility Web WordPress WordPress Plugins WordPress Themes Workflow XCode
Our Products
Add us on Facebook!
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.