Am 11/9/2012 11:25, schrieb John Szakmeister: > On Fri, Nov 9, 2012 at 4:27 AM, Tomas Carnecky <tomas.carne...@gmail.com> > 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.
If the renames are split in two commits, you can merge the first, and then the second on top of the result. -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
