* Git difftool / mergetool on directory tree
@ 2011-12-14 8:42 Daniele Segato
2011-12-14 16:25 ` Thomas Rast
2011-12-15 19:53 ` Neal Kreitzinger
0 siblings, 2 replies; 4+ messages in thread
From: Daniele Segato @ 2011-12-14 8:42 UTC (permalink / raw)
To: Git Mailing List
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Git difftool / mergetool on directory tree
2011-12-14 8:42 Git difftool / mergetool on directory tree Daniele Segato
@ 2011-12-14 16:25 ` Thomas Rast
2011-12-14 17:50 ` Junio C Hamano
2011-12-15 19:53 ` Neal Kreitzinger
1 sibling, 1 reply; 4+ messages in thread
From: Thomas Rast @ 2011-12-14 16:25 UTC (permalink / raw)
To: Daniele Segato; +Cc: Git Mailing List
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Git difftool / mergetool on directory tree
2011-12-14 8:42 Git difftool / mergetool on directory tree Daniele Segato
2011-12-14 16:25 ` Thomas Rast
@ 2011-12-15 19:53 ` Neal Kreitzinger
1 sibling, 0 replies; 4+ messages in thread
From: Neal Kreitzinger @ 2011-12-15 19:53 UTC (permalink / raw)
To: Daniele Segato; +Cc: Git Mailing List
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-12-15 19:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-14 8:42 Git difftool / mergetool on directory tree Daniele Segato
2011-12-14 16:25 ` Thomas Rast
2011-12-14 17:50 ` Junio C Hamano
2011-12-15 19:53 ` Neal Kreitzinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).