From: Jeff King <peff@peff.net>
Date: Wed, 03 Jun 2009 22:44:13 GMT
Subject: Re: Am able to delete a file with no trace in the log
Message-ID: <20090603224413.GA2902@coredump.intra.peff.net>
In-Reply-To: <7vmy8p54fr.fsf@alter.siamese.dyndns.org>

On Wed, Jun 03, 2009 at 03:38:00PM -0700, Junio C Hamano wrote:

> Actually for that "Where did my file 'x' go across the merge chain", I was
> going to suggest something like
> 
> 	git log --simplify-merges -m --raw -- x

But in the original example, the merge commit where 'x' is deleted isn't
shown _at all_ when path limiting is used. You end up either with
"git log -m" showing the two sides of the merge separately, "git log
--simplify-merges -- x" showing stuff that happened on the side branch
but _not_ the actual merge that made a change, or of course "git log --
x" showing nothing (because we don't traverse the changing side of the
merge).

Is there a way to say "show me everything that touched x, _including_
merges"?

-Peff