On 2009-02-19, Caleb Cushing <xenoterracide@xxxxxxxxx> wrote: >> Yes. I maintain two copies of something (in different >> repos) like this... > > nice... now the real kicker if I merge from another branch > sunrise/reviewed and redirect it's package.mask to > package.mask/sunrise will git be smart enough to differentiate from > the gentoo.org one and the sunrise one? I think even more important is > how would I even tell it to do that once I've moved the first one. Not sure I understood this completely, but I've found it helps to make the rename/move as a separate commit, then start changing stuff. In other words, do too many things in the same commit, and you could lose this coolness. There's some logic somewhere that says "if we can't find a match to merge this file, let's see if we ever had the same blob as the parent of the file in the MERGE_HEAD and we'll use that as a base to do the merge". -- 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
