Home » Mailing list archives » git » 2008 » June » 3

Re: Octopus merge: unique (?) to git, but is it useful?

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Linus Torvalds <torvalds@...>
To: Junio C Hamano <gitster@...>
Cc: <git@...>
Subject: Re: Octopus merge: unique (?) to git, but is it useful?
Date: Tuesday, June 3, 2008 - 10:40 am

On Mon, 2 Jun 2008, Junio C Hamano wrote:


Right. But git shouldn't do duplicate parents. I agree it's a mis-use of 
git merge, but either we should have errored out or we should have pruned 
the parents.

Yes, the end result is "tecnically correct", but it's not optimal.

		Linus
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
Octopus merge: unique (?) to git, but is it useful?, Jakub Narebski, (Mon Jun 2, 9:14 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Matthieu Moy, (Tue Jun 3, 6:06 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Jakub Narebski, (Tue Jun 3, 7:27 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Matthieu Moy, (Tue Jun 3, 7:53 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Daniel Villeneuve, (Mon Jun 2, 10:16 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Linus Torvalds, (Mon Jun 2, 10:05 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Jakub Narebski, (Tue Jun 3, 3:32 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Linus Torvalds, (Tue Jun 3, 3:54 pm)
Commit annotations (was:: Octopus merge: unique (?) to git, ..., Jakub Narebski, (Tue Jun 3, 4:27 pm)
Re: Commit annotations (was:: Octopus merge: unique (?) to g..., Johannes Schindelin, (Tue Jun 3, 4:33 pm)
Re: Commit annotations (was:: Octopus merge: unique (?) to g..., Johan Herland, (Tue Jun 3, 7:59 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 3:53 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 12:29 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Jakub Narebski, (Tue Jun 3, 2:39 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 3:11 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Mon Jun 2, 11:56 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Linus Torvalds, (Tue Jun 3, 10:40 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Miklos Vajna, (Tue Jun 3, 7:11 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 8:33 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 1:17 am)
Re: Octopus merge: unique (?) to git, but is it useful?, SZEDER , (Tue Jun 3, 6:40 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 3:30 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, SZEDER , (Tue Jun 3, 4:39 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 6:08 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, SZEDER , (Tue Jun 3, 7:10 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 9:02 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Jeff King, (Tue Jun 3, 8:35 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Johannes Schindelin, (Tue Jun 3, 1:28 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 1:42 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Johannes Schindelin, (Tue Jun 3, 4:31 am)