On Tue, Feb 12, 2008 at 11:44:07PM -0200, André Goddard Rosa wrote: > I would like to use kdiff3 to compare some folder like "include" > between two different revisions. > It would be something like "git diff v2.5:makefile HEAD:makefile", > but for an entire folder. > > Kdiff3 give me a quick glance of its nice graphical output of the > differences, without have to resort to looking/parsing 'git log' > output. > For now, easiest way for me is to keep my tree replicated in two > different folders pointing to different revisions then use it. > > Is there a better way to do this kind of comparison? Maybe you want something like this? This uses kdiff3 to compare two full commits, by extracting the changed files into a temporary location. Modifying it so it can work with path limiters and/or take arguments exactly like 'git diff' is left as an excercise for the reader. -bcd #!/bin/sh -e # usage: git-kdiff3 commit1 commit2 SUBDIRECTORY_OK=1 . git-sh-setup cd_to_toplevel O=".git-kdiff3-tmp-$$" list="$O/list" trap "rm -rf $O" 0 mkdir $O git diff --name-only -z $1 $2 > $list cat $list | xargs -0 git archive --prefix=a/ $1 | tar xf - -C $O cat $list | xargs -0 git archive --prefix=b/ $2 | tar xf - -C $O kdiff3 $O/a $O/b - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
