Skip to main content

Use meld as git diff gui viewer

Meld is a popular diff viewer in linux (gnome). It is extremely light weight. UI is very similar to WinDiff. Although it is not comprehensively robust yet, It is still a great help for people like me, handicapped to read huge diffs in command line.

Git is awesome when it comes to managing version control, esp in command line. However, while committing, you would want to check what changes are going in. git gives git-diff for this purpose. Spitting out a (unified) diff format text for showing changes. But reading this could be cumbersome at times. To visually inspect git diff, you can use the latest version of meld. The version that comes with debian or ubuntu 1.1.5 lacks git support. You need to build the latest meld (I got 1.2.1) from source. Here is how you can do it.
  • resolve dependencies: 
    sudo apt-get install pyorbit pygtk gnome-python intltool
  • Get the source from here (opens new window).
  • Extract the archive.
  • In the exploded directory, run make.
  • It makes an executable meld
  • Run meld path/to/git-project
  • That's it, if there are any modified files, it will display the changes.
meld and git
As an earlier alternative, if you have KDE or prefer to use kompare, You can pipe this to kompare to visually see the changes.
git diff . | kompare -o -

I have tried using egit for eclipse. It sure is good for many features (commit, track, reource history, pull et al) but misses the "compare with base version" feature as in svn. Meld fills in that gap.
Labels:

Popular posts from this blog

Powered By

As it goes, We ought to give thanks to people who power us. This page will be updated, like the version page , to show all the tools, and people this site is Powered By! Ubuntu GIMP Firebug Blogger Google [AppEngine, Ajax and other Apis] AddtoAny Project Fondue jQuery
Read More >>

Decorator for Memcache Get/Set in python

I have suggested some time back that you could modularize and stitch together fragments of js and css to spit out in one HTTP connection. That makes the page load faster. I also indicated that there ways to tune them by adding cache-control headers. On the server-side however, you could have a memcache layer on the stitching operation. This saves a lot of Resources (CPU) on your server. I will demonstrate this using a python script I use currently on my site to generate the combined js and css fragments. So My stitching method is like this @memize(region="jscss") def joinAndPut(files, ext): res = files.split("/") o = StringIO.StringIO() for f in res: writeFileTo(o, ext + "/" + f + "." + ext) #writes file out ret = o.getvalue() o.close() return ret; The method joinAndPut is * decorated * by memize. What this means is, all calls to joinAndPut are now wrapped (at runtime) with the logic in memize. All you wa...
Read More >>

Faster webpages with fewer CSS and JS

Its easy, have lesser images, css and js files. I will cover reducing number of images in another post. But If you are like me, You always write js and css in a modular fashion. Grouping functions and classes into smaller files (and Following the DRY rule, Strictly!). But what happens is, when you start writing a page to have these css and js files, you are putting them in muliple link rel=style-sheet or script tags. Your server is being hit by (same) number of HTTP Requests for each page call. At this point, its not the size of files but the number server roundtrips on a page that slows your page down. Yslow shows how many server roundtrips happen for css and js. If you have more than one css call and one js call, You are not using your server well. How do you achieve this? By concatinating them and spitting out the content as one stream. So Lets say I have util.js, blog.js and so.js. If I have a blog template that depends on these three, I would call them in three script tags. Wh...
Read More >>