Git difftool / mergetool on directory tree

Git difftool / mergetool on directory tree

[Daniele Segato]

Hi,

many diff / merge tool around have the ability to compare a directory 
tree (meld is one, but there are many).

Is there a way to start a difftool or a mergetool on a folder instead of 
the single file?

It would be an handsome feature to git.

I googled a little before popping out this question and I only found 
suggestion on how to open "many" file at once instead of opening them 
serially but that's not the same thing not as powerful as directory 
comparison.

Thanks,
Daniele

Re: Git difftool / mergetool on directory tree

[Thomas Rast]

Daniele Segato wrote:
> Hi,
> 
> many diff / merge tool around have the ability to compare a directory 
> tree (meld is one, but there are many).
> 
> Is there a way to start a difftool or a mergetool on a folder instead of 
> the single file?
> 
> It would be an handsome feature to git.
> 
> I googled a little before popping out this question and I only found 
> suggestion on how to open "many" file at once instead of opening them 
> serially but that's not the same thing not as powerful as directory 
> comparison.

Maybe this helps:

  http://thread.gmane.org/gmane.comp.version-control.git/144839

It was never applied however.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

Re: Git difftool / mergetool on directory tree

[Junio C Hamano]

Thomas Rast <trast@student.ethz.ch> writes:

> Daniele Segato wrote:
>> Hi,
>> 
>> many diff / merge tool around have the ability to compare a directory 
>> tree (meld is one, but there are many).
>> 
>> Is there a way to start a difftool or a mergetool on a folder instead of 
>> the single file?
>> 
>> It would be an handsome feature to git.
>> 
>> I googled a little before popping out this question and I only found 
>> suggestion on how to open "many" file at once instead of opening them 
>> serially but that's not the same thing not as powerful as directory 
>> comparison.
>
> Maybe this helps:
>
>   http://thread.gmane.org/gmane.comp.version-control.git/144839
>
> It was never applied however.

A later reincarnation of a similar idea was in

  http://thread.gmane.org/gmane.comp.version-control.git/184458/focus=184462

but the interest petered out, it seems.

Re: Git difftool / mergetool on directory tree

[Neal Kreitzinger]

On 12/14/2011 2:42 AM, Daniele Segato wrote:
> many diff / merge tool around have the ability to compare a directory
> tree (meld is one, but there are many).
>
> Is there a way to start a difftool or a mergetool on a folder instead of
> the single file?
>
> It would be an handsome feature to git.
>
> I googled a little before popping out this question and I only found
> suggestion on how to open "many" file at once instead of opening them
> serially but that's not the same thing not as powerful as directory
> comparison.
>
(This works with kdiff3 as the mergetool/difftool on git 1.7.1 on linux):

git difftool <commit>:<dir>/ <commit-2>:<dir>/

e.g., git difftool mycommit:ourdir/ yourcommit:ourdir/

<commit> = pointer to a commit (ie: sha-1, branchname, tag, ref)
<dir> = path of dir relative to worktree


v/r,
neal