threads / discuss / 29161

Git difftool / mergetool on directory tree

Subject: Git difftool / mergetool on directory tree

## tl;dr

4 messages between Dec 14, 2011 and Dec 15, 2011.

replies: 3people: 4as markdown or json

Daniele Segato· Dec 14, 2011, 08:42 UTC · lore

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

Thomas Rast· Dec 14, 2011, 16:25 UTC · re: Daniele Segato · lore

Re: Git difftool / mergetool on directory tree

Daniele Segato wrote:

Show 14 quoted lines

> 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

Junio C Hamano· Dec 14, 2011, 17:50 UTC · re: Thomas Rast · lore

Re: Git difftool / mergetool on directory tree

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

Show 21 quoted lines

> 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.

Neal Kreitzinger· Dec 15, 2011, 19:53 UTC · re: Daniele Segato · lore

Re: Git difftool / mergetool on directory tree

On 12/14/2011 2:42 AM, Daniele Segato wrote:

Show 13 quoted lines

> 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