Re: External diff viewer and stage/merge tool and git-gui?

From: David Aguilar <davvid@gmail.com>
Date: Jun 3, 2008, 10:56 UTC
Message-ID: <402731c90806030356r1ea4317vef40b6449f4fca16@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.64.0806030819310.31572@ds9.cixit.se>

On Tue, Jun 3, 2008 at 12:24 AM, Peter Karlsson <peter@softwolves.pp.se> wrote:

Show 9 quoted lines

> Hi!
>
> As I continue to introduce Git at my workplace, I got the question on
> how to integrate external diff tools with Git. I figured out a way to
> get it to work with the command-line "git-diff", by setting
> GIT_EXTERNAL_DIFF and hacking together a small batch file (yeah, this
> is on Windows) that opens the diff in the viewer. For myself, I would
> like to use tkdiff, whereas the rest of the team is used to another
> side-by-side diff viewer.

Have you taken a look at ugit?

http://repo.or.cz/w/ugit.git (requires the latest GitPython http://gitorious.org/projects/git-python/)

It can launch external diff tools. It also has a very fine diff gui. You can either select the entire diff hunk or, if you need to be more precise, drill down to specific lines from a diff.

If the built-in diff selection doesn't suffice just right-click in the modified files section where there's an option to send the diff to a diff editor. You can define that to be tkdiff, xxdiff, etc.

-- 
 David