diff

Gitx has a great diff viewer, how do I make git automatically pipe git diff whatever into gitx? I've tried to set git config diff.external to a shell script that looks like this: git diff "$2" "$5" | gitx However, that only opens all the individual files up into multiple gitx windows, and it really messes up the files names (changes them all to tmp files with crazy names). Does anyone have a better solution? like sigjuice is saying up there. Only that noobs (like i am now) need to know how to "connect" git to use it. Here is what I did echo 'opendiff $2 $5' > ~/opendiff-git.sh chmod a+x ~

I need to work with large files and must find differences between two. And I don't need the different bits, but the number of differences. To find the number of different rows I come up with diff --suppress-common-lines --speed-large-files -y File1 File2 | wc -l And it works, but is there a better way to do it? And how to count the exact number of differences (with standard tools like bash, diff, awk, sed some old version of perl)? diff -U 0 file1 file2 | grep -v ^@ | wc -l That minus 2 for the two file names at the top of the diff listing. Unified format is probably a bit faster than side-by

Are there any Binary Diff tools for Mac OS X with a GUI? There are a gazillion text-based diff tools, but I need to compare two binary files. Essentially two Hex Editors with Dec/Hex View next to each other (the binary files are a custom file format, so not images or anything that has a more specialized diff tool) there is Ellié Computing Merge ( http://www.elliecomputing.com ) (NB: I work for ECMerge). it can compare arbitrarily large files with usual Hex+ASCII views and side by side visual diff. it works on mac and linux/windows as well Stefan Schmidt I just discoverd Hex Fiend – love at

I am trying to write a simple algorithm to read two XML files with the exact same nodes and structure but not necessarily the same data inside the child nodes and not the same order. How could I create a simple implementation for creating a third, temporary XML being the differential between the two first ones, using Microsoft's XML Diff .DLL ? XML Diff on MSDN: XML Diff and Patch Tool XML Diff and Patch GUI Tool sample XML code of the two different XML files to compare: <?xml version="1.0" encoding="utf-8" ?> <Stats Date="2011-01-01"> <Player Rank="1"> <Name>Sidney Crosby</Name> <Team>PIT<

I made some changes to an open source project without taking time to create proper patch files. Now, the maintainer of the project released a new version, and among new and edited files, there are a bunch of renamed files. Whats is the best way to apply my changes to the new version ? I'm completely new to diff/patch use, and If I can get it done with git, it would be better. William Pursell If you have two directories a and b that are similar, and you want b to be the same as a , you can create and apply a patch with: $ diff -ur b a > ba.diff $ patch -i ba.diff Suppose you have directories

So the utility Diff works just like I want for 2 files, but I have a project that requires comparisons with more than 2 files at a time, maybe up to 10 at a time. This requires having all those files side by side to each other as well. My research has not really turned up anything, vimdiff seems to be the best so far with the ability to compare 4 at a time. My question: Is there any utility to compare more than 2 files at a time, or a way to hack diff/vimdiff so it can do multiple comparisons? The files I will be comparing are relatively short so it should not be too slow. Thanks in advance!

This question already has an answer here: How do I git diff on a certain directory 4 answers As in the title, I want to have a diff file for a certain folder between the master branch and a branch I have created. You can use git diff master..yourbranch path/to/folder git diff compares trees (as in hierarchies of source files at two different points in time), so it can't extract the changes done by a certain author. If you want to see what changes a user committed, then you need git log . Does this solve your need? git log --author=jdoe oldbranch..newbranch -p -- path/to/subdirectory >

in windows I am able to use winmerge as the external diff tool for hg using mercurial.ini ,etc. Using some options switch that you can find in web(I think it's a japanese website) Anyway, here for example: hg winmerge -r1 -r2 will list file(s) change(s) between rev1 and rev2 in winmerge. I can just click which file to diff but for bc3: hg bcomp -r1 -r2 will make bc3 open a dialog which stated that a temp dir can't be found. The most I can do using bc3 and hg is hg bcomp -r1 -r2 myfile.cpp which will open diff between rev1 and rev2 of myfile.cpp So,it seems that hg+bc3 can't successfully