On Fri, Nov 9, 2012 at 5:25 PM, John Szakmeister <john@xxxxxxxxxxxxxxx> wrote: > On Fri, Nov 9, 2012 at 4:27 AM, Tomas Carnecky <tomas.carnecky@xxxxxxxxx> wrote: > [snip] >> When merging two branches, git only looks at the tips. It doesn't inspect >> their histories to see how the files were moved around. So i doesn't matter >> whether you rename the files in a single commit or multiple commits. The >> resulting tree is always the same. > > I guess I figured that when I saw the final result, but didn't know if > there was a way to coax Git into doing a better job here. I guess not > though. There is not (yet). There were a few patches around that allow users to override git's automatic renames. You can search the mail archive. I think the keywords are "rename cache". Thanks for reminding me for putting a higher priority on that. -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html