Re: git-difftool

From: David Aguilar <davvid@gmail.com>
Date: Jan 16, 2009, 05:05 UTC
Message-ID: <402731c90901152105q1880c5beod4146d955f04dd8b@mail.gmail.com>
In-Reply-To: <200901152326.47332.markus.heidelberg@web.de>

On Thu, Jan 15, 2009 at 2:26 PM, Markus Heidelberg <markus.heidelberg@web.de> wrote:

Show 24 quoted lines

> David Aguilar, 02.01.2009:
>> I now have a git-difftool wrapper script that basically just sets up
>> the environment for git-difftool-helper.  git-difftool-helper does all
>> of the merge tool configuration stuff ala
>> http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html (it
>> uses the same git config variables and thus works with existing custom
>> commands).  If you drop them both into the same directory it should
>> work as-is (it munges $PATH).
>>
>> It's not a two-liner (they do all that git config stuff and handle
>> more than just vimdiff) but it does use GIT_EXTERNAL_DIFF now, which
>> makes the script infinitely more useful.  This is much nicer now since
>> you can pass any 'git diff' options to git-difftool and it'll handle
>> it correctly.
>>
>> The usage is simpler now too:
>>
>> usage: git difftool [--no-prompt] [--tool=tool] ["git diff" options]
>
> Now isn't this something for contrib, David?
>
> Markus
>
>

It sure is.

BTW the script worked beautifully on *nix.

I later decided to give it a try on Windows and of course it didn't work right the first time. Once I added a check to use "git.exe" instead of "git" then it started working again. I'll prepare some documentation and post a patch later tonight.

Thanks for reminding me,

-- 
    David


(p.s. Markus: sorry for the double-email -- I forgot to cc: the list)