{"thread":{"id":"29161","subject":"Git difftool / mergetool on directory tree","startedAt":"2011-12-14T08:42:54Z","lastAt":"2011-12-15T19:53:01Z","messageCount":4,"participants":["Daniele Segato","Thomas Rast","Junio C Hamano","Neal Kreitzinger"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"181119","messageId":"4EE8618E.7020902@gmail.com","threadId":"29161","inReplyTo":null,"subject":"Git difftool / mergetool on directory tree","fromName":"Daniele Segato","fromEmail":"daniele.bilug@gmail.com","sentAt":"2011-12-14T08:42:54Z","receivedAt":"2011-12-14T08:42:54Z","isPatch":false,"sender":{"key":"daniele.bilug@gmail.com","avatar":null},"body":"Hi,\n\nmany diff / merge tool around have the ability to compare a directory \ntree (meld is one, but there are many).\n\nIs there a way to start a difftool or a mergetool on a folder instead of \nthe single file?\n\nIt would be an handsome feature to git.\n\nI googled a little before popping out this question and I only found \nsuggestion on how to open \"many\" file at once instead of opening them \nserially but that's not the same thing not as powerful as directory \ncomparison.\n\nThanks,\nDaniele\n"},{"id":"181160","messageId":"201112141725.14729.trast@student.ethz.ch","threadId":"29161","inReplyTo":"4EE8618E.7020902@gmail.com","subject":"Re: Git difftool / mergetool on directory tree","fromName":"Thomas Rast","fromEmail":"trast@student.ethz.ch","sentAt":"2011-12-14T16:25:14Z","receivedAt":"2011-12-14T16:25:14Z","isPatch":false,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Daniele Segato wrote:\n> Hi,\n> \n> many diff / merge tool around have the ability to compare a directory \n> tree (meld is one, but there are many).\n> \n> Is there a way to start a difftool or a mergetool on a folder instead of \n> the single file?\n> \n> It would be an handsome feature to git.\n> \n> I googled a little before popping out this question and I only found \n> suggestion on how to open \"many\" file at once instead of opening them \n> serially but that's not the same thing not as powerful as directory \n> comparison.\n\nMaybe this helps:\n\n  http://thread.gmane.org/gmane.comp.version-control.git/144839\n\nIt was never applied however.\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"},{"id":"181174","messageId":"7vliqfqbzg.fsf@alter.siamese.dyndns.org","threadId":"29161","inReplyTo":"201112141725.14729.trast@student.ethz.ch","subject":"Re: Git difftool / mergetool on directory tree","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-12-14T17:50:11Z","receivedAt":"2011-12-14T17:50:11Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Rast <trast@student.ethz.ch> writes:\n\n> Daniele Segato wrote:\n>> Hi,\n>> \n>> many diff / merge tool around have the ability to compare a directory \n>> tree (meld is one, but there are many).\n>> \n>> Is there a way to start a difftool or a mergetool on a folder instead of \n>> the single file?\n>> \n>> It would be an handsome feature to git.\n>> \n>> I googled a little before popping out this question and I only found \n>> suggestion on how to open \"many\" file at once instead of opening them \n>> serially but that's not the same thing not as powerful as directory \n>> comparison.\n>\n> Maybe this helps:\n>\n>   http://thread.gmane.org/gmane.comp.version-control.git/144839\n>\n> It was never applied however.\n\nA later reincarnation of a similar idea was in\n\n  http://thread.gmane.org/gmane.comp.version-control.git/184458/focus=184462\n\nbut the interest petered out, it seems.\n"},{"id":"181245","messageId":"4EEA501D.3050401@gmail.com","threadId":"29161","inReplyTo":"4EE8618E.7020902@gmail.com","subject":"Re: Git difftool / mergetool on directory tree","fromName":"Neal Kreitzinger","fromEmail":"nkreitzinger@gmail.com","sentAt":"2011-12-15T19:53:01Z","receivedAt":"2011-12-15T19:53:01Z","isPatch":false,"sender":{"key":"nkreitzinger@gmail.com","avatar":null},"body":"On 12/14/2011 2:42 AM, Daniele Segato wrote:\n> many diff / merge tool around have the ability to compare a directory\n> tree (meld is one, but there are many).\n>\n> Is there a way to start a difftool or a mergetool on a folder instead of\n> the single file?\n>\n> It would be an handsome feature to git.\n>\n> I googled a little before popping out this question and I only found\n> suggestion on how to open \"many\" file at once instead of opening them\n> serially but that's not the same thing not as powerful as directory\n> comparison.\n>\n(This works with kdiff3 as the mergetool/difftool on git 1.7.1 on linux):\n\ngit difftool <commit>:<dir>/ <commit-2>:<dir>/\n\ne.g., git difftool mycommit:ourdir/ yourcommit:ourdir/\n\n<commit> = pointer to a commit (ie: sha-1, branchname, tag, ref)\n<dir> = path of dir relative to worktree\n\n\nv/r,\nneal\n"}]}