On Wed, May 10, 2017 at 02:15:23PM -0500, Samuel Lijin wrote: > On Wed, May 10, 2017 at 9:46 AM, Jonny Gilchrist > <jonnygilchr...@gmail.com> wrote: > > Hi, > > > > After doing a subtree merge, using 'git log' and 'git log --follow' on > > files in the subtree show only the merge commit in which they were > > added. > > > > After reading around I understand that the issue is that git log > > --follow doesn't track renames that occur during a merge. > > Try git log --follow -M. (You may also want to combine this with -l and/or > -C).
You shouldn't need to specify "-M" with --follow, as the diff done by try_to_follow_renames() turns on rename (and copy) detection explicitly. I suspect the problem is that git-log does not do merge diffs at all by default, and you'd need "-c" or "--cc" (or maybe even "-m") to turn them on. I wouldn't be surprised if there are other problems where that code path isn't quite ready to handle merge commits, though. -Peff
