mbing
components.
Hence my question
-Original Message-
From: Linus Torvalds [mailto:[EMAIL PROTECTED]
Sent: Friday, April 15, 2005 4:31 PM
To: Barry Silverman
Cc: git@vger.kernel.org
Subject: RE: Merge with git-pasky II.
[ I'm cc'ing the git list even though Barry'
>>In particular, if you ever find yourself wanting to graft together two
>>different commit histories, that almost certainly is what you'd want
to >>do. Somebody might have arrived at the exact same tree some other
way, >>starting with a 2.6.12 tar.ball or something, and I think we
should at >>leas
JH->Junio Hamano, LT->Linus Torvalds
JH>>I just have this fuzzy feeling that, when doing this merge:
A-1 --- A-2 --- A-3
/ \
Common Ancestor Merge Result
\ /
ted trees and blobs (unless used to merge).
Is this a bug or a feature?
Barry Silverman
-
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
4 matches
Mail list logo