threads / discuss / 26533

My git-gui difftool script

Subject: My git-gui difftool script

## tl;dr

6 messages between Feb 17, 2011 and Feb 18, 2011.

replies: 5people: 2as markdown or json

Chunlin Zhang· Feb 17, 2011, 13:22 UTC · lore

My git-gui difftool scipt can use now.Can use with meld/beyond compare and so on visual diff tool. Upload to https://github.com/zhangchunlin/gitguidifftool ,and the usage is in README.

Michael J Gruber· Feb 17, 2011, 16:28 UTC · re: Chunlin Zhang · lore

Re: My git-gui difftool script

Chunlin Zhang venit, vidit, dixit 17.02.2011 14:22:

Show 5 quoted lines

> My git-gui difftool scipt can use now.Can use with meld/beyond compare and so on
> visual diff tool.
> Upload to https://github.com/zhangchunlin/gitguidifftool ,and the usage is in
> README.
>

I don't want to spoil the party, but how is this different from using "git difftool -y $FILENAME" for the command?

Michael

Chunlin Zhang· Feb 18, 2011, 01:12 UTC · re: Michael J Gruber · lore

Re: My git-gui difftool script

Michael J Gruber <michaeljgruber+gmane <at> fastmail.fm> writes:

> 
> 
> I don't want to spoil the party, but how is this different from using
> "git difftool -y $FILENAME" for the command?

Because in git-gui I can know which files are modified and which file are staged
more clearly and directly,and I can examine the diff over and over again if I
 like.

> 
> Michael
>

Michael J Gruber· Feb 18, 2011, 07:36 UTC · re: Chunlin Zhang · lore

Re: My git-gui difftool script

Chunlin Zhang venit, vidit, dixit 18.02.2011 02:12:

Show 10 quoted lines

> Michael J Gruber <michaeljgruber+gmane <at> fastmail.fm> writes:
> 
>>
>>
>> I don't want to spoil the party, but how is this different from using
>> "git difftool -y $FILENAME" for the command?
> 
> Because in git-gui I can know which files are modified and which file are staged
> more clearly and directly,and I can examine the diff over and over again if I
>  like.

Well, of course, but in git-gui's Tools menu you can use

"git difftool -y $FILENAME"

instead of

"YOUR_PATH_TO_git_gui_difftool.py $FILENAME"

for the command. So I'm just wondering what your new difftool.py does differently from the existing git-difftool.

Michael

Chunlin Zhang· Feb 18, 2011, 08:26 UTC · re: Michael J Gruber · lore

Re: My git-gui difftool script

Michael J Gruber <michaeljgruber+gmane <at> fastmail.fm> writes:

Show 11 quoted lines

> "git difftool -y $FILENAME"
> 
> instead of
> 
> "YOUR_PATH_TO_git_gui_difftool.py $FILENAME"
> 
> for the command. So I'm just wondering what your new difftool.py does
> differently from the existing git-difftool.
> 
> Michael
>

... I just found that I am reinventing the wheel and it is a worse wheel.

I suggest this should be integrated into git-gui.

Michael J Gruber· Feb 18, 2011, 09:24 UTC · re: Chunlin Zhang · lore

Re: My git-gui difftool script

Chunlin Zhang venit, vidit, dixit 18.02.2011 09:26:

Show 15 quoted lines

> Michael J Gruber <michaeljgruber+gmane <at> fastmail.fm> writes:
> 
>> "git difftool -y $FILENAME"
>>
>> instead of
>>
>> "YOUR_PATH_TO_git_gui_difftool.py $FILENAME"
>>
>> for the command. So I'm just wondering what your new difftool.py does
>> differently from the existing git-difftool.
>>
>> Michael
>>
> ...
> I just found that I am reinventing the wheel and it is a worse wheel.

You have taught me about git-gui's Tools menu which I didn't know before. So we both learned something :)

> I suggest this should be integrated into git-gui.

Sounds fine with me, although the flexibility of difftool may prevent having a sane default for "use terminal".

Michael