2009/2/10 Peter W. Draper <[log in to unmask]>:
> On Tue, 10 Feb 2009, Mark Taylor wrote:
>
>> On Tue, 10 Feb 2009, David Berry wrote:
>>
>> > Does anyone know of any way of getting a nicely formatted display of
>> > the differences between two revisions of the same file, like you used
>> > to get with svnweb? That is, the page split into left and right panes
>> > with the old file in the left pane and the new file in the right pane?
>>
>> I use xxdiff (http://furius.ca/xxdiff/) with svn and cvs like this:
>>
>> cvs update -p file | xxdiff - file
>>
>> svn diff --diff-cmd xxdiff-wrap file
>> (where xxdiff-wrap looks like:
>> #!/bin/sh
>> shift `echo $# 2 - p | dc`
>> xxdiff -w $1 $2)
>>
>> I don't know if (a) there's a better way of doing this in git or
>> (b) whether it can be made to work with git, but it might be useful.
Making git use an external diff viewer looks like a bit of a fight.
Seems like it can be done though, given time...
> I'm using "meld" to get a similar effect. The simplest way to use this is
> in the gitk tool. Run that up and select the changeset you want to see the
> differences in.
>
> Now in the lower-right hand pane (with Patch and Tree at the top) select
> the file you want the diffs for and right-click it. Select "External
> diff". That should run up meld (if it doesn't make sure you have meld
> installed and check the gitk preferences).
Thanks for that. Seems to work nicely (once I worked out what the Up
and Down buttons were for).
David
|