Re: git-difftool

From: David Aguilar <davvid@gmail.com>
Date: Jan 17, 2009, 04:41 UTC
Message-ID: <402731c90901162041w2437587bsae1e6dde9384a4b3@mail.gmail.com>
In-Reply-To: <1232164040173-2171934.post@n2.nabble.com>

On Fri, Jan 16, 2009 at 7:47 PM, enso <a.calhoon@gmail.com> wrote:

Show 19 quoted lines

> Ping Yin wrote:
>>
>> Thanks. With GIT_PAGER="" it works now.
>>
>
> Personally, I didn't like having to screw around with environment variables
> directly to get vimdiff to work. So I did the following:
>
> 1) Made a simple diff script gitvimdiff.sh:
>
> #!/bin/env sh
> vimdiff "$2" "$5"
>
> 2) git config --global diff.external ~/path/to/gitvimdiff.sh
> 3) git config --global pager.diff ""
>
> Now when I run git-diff it uses vimdiff (hooray) and automatically turns the
> pager off for me! Now only if I could get meld to work under cygwin.
> --

Hello sir It sounds like you were looking for exactly the patch I sent last night =)

http://article.gmane.org/gmane.comp.version-control.git/105925

With 'git difftool' you just do it once:

git config --global merge.tool vimdiff git difftool [diff options]

The nice thing is that it supports the same configuration variables as 'git mergetool', so if you've already set things up to work correctly with mergetool then you're already setup for difftool.

Meld.. I can't say I've used it on windows. I have successfully used kdiff3 with msysgit, though. I just downloaded it and copied it to /bin.

difftool supports meld, though, so if you get a build of meld that works then you should in theory be able to use it just by setting merge.tool to meld.

-- 
    David