So I have a thing happen to me that happened once before: I’d done
git log --follow «file» and the newest commit I saw was the deletion of «file». However, the file was still in my repo.
Later I figured out that I’d re-added the file in a merge commit (probably one line of development had removed the file while the other one had changed it).
git log «file» (or
git log --follow «file») seems to ignore merge commits when looking for changes to «file». Is there any way to force it to not do that?
I’m using git 2.4.0.