From: Linus Torvalds <torvalds@osdl.org>
Date: Sun, 24 Apr 2005 04:55:21 GMT
Subject: Re: [PATCH] make file merging respect permissions
Message-ID: <Pine.LNX.4.58.0504232153500.15879@ppc970.osdl.org>
In-Reply-To: <1114317771.4980.7.camel@mulgrave>



On Sat, 23 Apr 2005, James Bottomley wrote:
> 
> OK ... this is done by reapplying to the top of your git tree and then
> doing a show-diff.  I've checked that it actually applies without
> rejections to a pristine git tree.

Well, I actually ended up editing the line numbers manually and already 
pushed out the previous one, so you might want to double-check that my 
current tree matches yours.

		Linus