On Sun, Jun 26, 2011 at 04:10:23PM +0200, Christof Krüger <git@xxxxxxxxxxxxxxxxxxx> wrote: > In this particular case, it seems that the offending commit is indeed a > merge commit (a5f45ee4). But it rather looks like user error and not a > git bug to me. When I checkout its first parent (a5e830ee) and merge > its second parent (93b01c6c) myself, I get some conflicts, but the > ogle-gui file stays deleted. > > As to how to detect what pulled the file back in: > I added --graph to your command line which implies parent rewriting. > This includes merges and should give you some information about the > "topology" of the history graph, leaving out irrelevant commits > in-between. I wouldn't call myself a history simplification exptert, so > there might still be cases where this does not help, but in this case it > indeed shows the offending merge commit. Hi Chris, Great, --graph indeed lists two merge commits, and if I check the tree objects manually, I can see which one introduced the file. But I still don't really understand --name-status why don't show the addition of those files, given that I hoped this counts as an "evil merge". Thanks.
Attachment:
pgpIUmgS7fZ1S.pgp
Description: PGP signature