branch gentoo.org has a file profiles/package.mask the software that uses this supports having this be a directory as well. I'm thinking of mv-ing this file in branch regen2.org to profiles/package.mask/gentoo.org since I can't change the location in gentoo.org (for mostly non-technical reasons) when I run git merge gentoo.org from regen2.org will git be smart enough to try to merge an updated profiles/package.mask into profiles/package.mask/gentoo.org in the future? -- Caleb Cushing http://xenoterracide.blogspot.com -- 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
