From: Linus Torvalds Date: Thu, 28 Apr 2005 21:50:08 GMT Subject: Re: Finding file revisions Message-ID: In-Reply-To: <1114723987.4212.51.camel@localhost.localdomain> On Thu, 28 Apr 2005, Kay Sievers wrote: > > Sure. But file-changes lists the commit: > c79bea07ec4d3ef087962699fe8b2f6dc5ca7754 > > when asked for: > "drivers/usb/core/usb.c" > > and that file isn't touched there. Actually it lists merge-commits which > are not related to the file. It really _is_ touched by that commit. Look closer. It has two parents: one that had already merged with Greg's USB tree, and one that had _not_ done so. So whether it "modifies" the USB files or not really depends on which parent you go back. In general, you tend to want to ignore merge-nodes for looking at differences, but the differences are definitely there, and they are often vital (ie it's often _very_ important to know which side of a merge didn't change something). Linus