From: Linus Torvalds Date: Wed, 03 Jun 2009 21:33:39 GMT Subject: Re: Am able to delete a file with no trace in the log Message-ID: In-Reply-To: <7vtz2x6mor.fsf@alter.siamese.dyndns.org> On Wed, 3 Jun 2009, Junio C Hamano wrote: > > E.g. "git log --graph --oneline -- git-clone.sh" shows that the scripted > version ceased to exist at 8434c2f Btw, this example misses the whole point of the original problem. The original problem was: - create new file 'x' in branch 'a' - merge branch 'a' into branch 'b', but because of a merge conflict and confurion in the merge, the merge result doesn't contain 'x' any more. - try to find out what happened to 'x' after-the-fact. Try it. Git really doesn't make it very easy, because git will notice that 'x' didn't exist before the branch either (in branch 'b'), so there will be _no_ sign of 'x' actually going away. Linus