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

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Jakub Narebski
Date: Monday, June 2, 2008 - 11:39 pm

On Tue, 3 June 2008, Junio C Hamano wrote:

There shouldn't be, I think, a problem if octopus merge was done using
'octopus' merge strategy, which requires IIRC tree-level (trivial)
merge.  But true, it is a complication, unless we fake history more,
and always use result for octopus merge as a tree.

-- 
Jakub Narebski
Poland
--
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, 6:14 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Linus Torvalds, (Mon Jun 2, 7:05 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Daniel Villeneuve, (Mon Jun 2, 7:16 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Mon Jun 2, 8:56 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Mon Jun 2, 9:29 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Mon Jun 2, 10:17 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Johannes Schindelin, (Mon Jun 2, 10:28 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Mon Jun 2, 10:42 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Jakub Narebski, (Mon Jun 2, 11:39 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 12:11 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Jakub Narebski, (Tue Jun 3, 12:32 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 12:53 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Johannes Schindelin, (Tue Jun 3, 1:31 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Jakub Narebski, (Tue Jun 3, 4:27 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Linus Torvalds, (Tue Jun 3, 7:40 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 12:30 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Linus Torvalds, (Tue Jun 3, 12:54 pm)
Re: Commit annotations (was:: Octopus merge: unique (?) to ..., Johannes Schindelin, (Tue Jun 3, 1:33 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 3:08 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 5:33 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 6:02 pm)