On Fri, 2007-08-24 at 10:11 -0600, Josh England wrote: > On Thu, 2007-08-23 at 15:08 -0700, Junio C Hamano wrote: > > Of course, you would need to worry about resolving merge > > conflicts of gitattributes file, too. > > I'm still confused on things. So, with all perms/ownership stored > as .gitattributes, would mucking around with the index still be > necessary? I'm not too sure what to do about merge conflicts. OK, let me know if this is completely off-base. perms/ownership can be stored in the index at update-index time and restored maybe at checkout-index time. Calls to write-tree and read-tree can store/retrieve the perms/ownership data from a .gitattributes file somewhere; and something sane needs to be done about merging. Does this sound reasonable enough for a first cut? -JE - 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
