On Wed, May 10, 2017 at 9:46 AM, Jonny Gilchrist <jonnygilchrist@xxxxxxxxx> 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). > Has there been any work (or are there any plans) to allow git log > --follow to work in this case? I couldn't find anything in the mailing > list archives aside from a couple of threads from 2011 explaining the > issue. > > Thanks, > J.