From: Linus Torvalds <torvalds@osdl.org>
Date: Fri, 06 May 2005 16:19:02 GMT
Subject: Re: Version of dirdiff to display diffs between git trees
Message-ID: <Pine.LNX.4.58.0505060916320.2233@ppc970.osdl.org>
In-Reply-To: <17019.28326.351036.268948@cargo.ozlabs.ibm.com>



On Fri, 6 May 2005, Paul Mackerras wrote:
> The main window summarizes which files have changed.  Double-clicking
> on a file name pops up a diff viewer window which displays the
> differences between the different versions of the file in a
> color-coded unidiff format.  I find it useful to copy .git/HEAD to
> .git/OLD_HEAD before doing an update on my linux-2.6 repository, and
> then after the update do

If you use git-pull-script, it does this for you (except it calls it
ORIG_HEAD), and you can just do

	git-diff-tree -p ORIG_HEAD HEAD

to see the changes. In fact git-pull-script will do that for you, and 
output the diffstat of it.

Having the original head is also nice for when you decide that the other 
side has had a few too many drugs, in which case you just do

	cat .git/ORIG_HEAD > .git/HEAD
	git-read-tree -m HEAD
	git-checkout-cache -f -a
	git-update-cache --refresh

and you're back to your original head (the above is basically "unpull").

		Linus