On Tue, Jun 02, 2009 at 02:33:14PM -0500, Graham Perks wrote: > # File b.txt deleted! Woah! How did that happen? > # gitk and git log show nothing about the deletion. > # There seems to be no evidence about who, how, why, or when the file got > deleted. > # So it's hard to track down which user mis-used the system and educate > them. I think this is a funny interaction with the way the diffs for merge commits are shown. The diff you are looking for is definitely available. In your example: # compare the second parent of the merge to the merge result $ git diff-tree HEAD^2 HEAD :100644 100644 31e0fce560e96c8b357f5b8630c7d8fbeb0a3ec8 2dc6d98afe942589307d7c0166971b3a2ec8706d M a.txt :100644 000000 b023018cabc396e7692c70bbf5784a93d3f738ab 0000000000000000000000000000000000000000 D b.txt But it doesn't show up in "git log". I believe this is because the rule for what to show in a merge commit is "if content is exactly the same as one of the parents, it's not interesting". That is, deleting "b.txt" from the second parent ends up being exactly as it is in the first parent -- nonexistent. So git has no idea that you deleted "b.txt" accidentally, and it was not simply part of the conflict resolution. So I think this is working as intended, and is not a bug exactly. But certainly the behavior leaves something to be desired for actually tracking down the source of the change later on. I don't think there is a way to get "git show $merge" to show the deletion, and nor does it show up under "git log -- b.txt". Even worse, the latter produces no output at all for your example (you need "--full-history" to tell it to follow both parents of a merge). I wonder if we need some kind of "--verbose-merges" option to tell the diff engine that we really are interested in all of the changes that happened in a merge. But maybe we even have something and I don't know about it. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html