Re: xdiff: generate "anti-diffs" aka what is common to two files

From: Junio C Hamano <junkio@cox.net>
Date: Jun 29, 2006, 06:04 UTC
Message-ID: <7vbqscwl8b.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.64.0606282149060.12404@g5.osdl.org>

Linus Torvalds <torvalds@osdl.org> writes:

> Junio: the patch that actually _uses_ this comes next. It's based on my 
> previous "throw-away" example patches, if you want me to base it on 
> something else, please holler.

Nah, I appreciate that you did it this way, because it gave me a test case to "git-am" your two patches into a temporary branch and "pull --squash" that into lt/merge-tree branch ;-).

	git am ./+LT.mbox
        ... two patches, applied with --whitespace=strip ...
	git tag -f CG
        git reset --hard HEAD^^
        git pull --squash . tag CG
        git commig -C CG
        git tag -d CG