Daniel Barkalow <[EMAIL PROTECTED]> writes: > I assume that what you want is something to include everything from two > commits, which would give conflicts if a name is reused?
My understanding is that Darrin wants to do what Linus did when he merged gitk into git.git. Personally I think that is a specialized application and something like the git-merge-projects script I posted as a follow-up would be more appropriate than adding it to the current merge discussion. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html