Re: git log --follow after subtree merge

2017-05-11 Thread Konstantin Khomoutov
On Wed, May 10, 2017 at 02:15:23PM -0500, Samuel Lijin wrote: > On Wed, May 10, 2017 at 9:46 AM, Jonny Gilchrist > 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

Re: git log --follow after subtree merge

2017-05-11 Thread Jeff King
On Thu, May 11, 2017 at 02:35:49AM -0400, Jeff King wrote: > > > 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

Re: git log --follow after subtree merge

2017-05-11 Thread Jeff King
On Wed, May 10, 2017 at 02:15:23PM -0500, Samuel Lijin wrote: > On Wed, May 10, 2017 at 9:46 AM, Jonny Gilchrist > 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

Re: git log --follow after subtree merge

2017-05-10 Thread Samuel Lijin
On Wed, May 10, 2017 at 9:46 AM, Jonny Gilchrist 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

git log --follow after subtree merge

2017-05-10 Thread Jonny Gilchrist
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. Has there been any work