Deleted file is back - how to investigate?

Hi,

In our public development repo I removed a file in the past, and I guess with one of the recent merges we got it back. It looks a bit strange:

$ git clone http://frugalware.org/git/pub/frugalware/frugalware-current $ git checkout 96b33e0

The ogle-gui directory is there:

$ git ls-files|grep ogle-gui source/xapps-extra/ogle-gui/FrugalBuild

But in case I run git log:

$ git log --full-history --name-status -- source/xapps-extra/ogle-gui

The latest listed commit is the one that deletes it. So how can I see which commit introduced the file again? (FWIW, we're merging with the normal recursive strategy, ideally thing special.)

Thanks.