From: Len Brown <lenb@kernel.org>
To: Theodore Tso <tytso@mit.edu>
Cc: Rocco Rutte <pdmef@gmx.net>, git@vger.kernel.org
Subject: Re: mercurial to git
Date: Fri, 16 Mar 2007 00:53:54 -0400 [thread overview]
Message-ID: <200703160053.54699.lenb@kernel.org> (raw)
In-Reply-To: <20070315210406.GA8568@thunk.org>
On Thursday 15 March 2007 17:04, Theodore Tso wrote:
> So it does handle octopus merges already (it has to, the ACPI folks
> are very ocotpus merge happy :-).
Well, just to set the record straight...
So yes, I did a 12-way merge in the kernel a long while back on a lark.
I don't generally do them any more in the official kernel tree
because I think they make bisect more complicated than it needs to be.
cheers,
-Len
next prev parent reply other threads:[~2007-03-16 4:55 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-06 21:06 mercurial to git Rocco Rutte
2007-03-06 21:54 ` Theodore Tso
2007-03-06 22:47 ` Rocco Rutte
2007-03-06 23:08 ` Josef Sipek
2007-03-07 0:11 ` Theodore Tso
[not found] ` <20070314111257.GA4526@peter.daprodeges.fqdn.th-h.de>
2007-03-15 0:25 ` Theodore Tso
2007-03-15 10:19 ` Rocco Rutte
2007-03-15 14:12 ` Theodore Tso
2007-03-15 15:19 ` Rocco Rutte
2007-03-15 15:56 ` Linus Torvalds
[not found] ` <20070314132951.GE12710@thunk.org>
[not found] ` <20070315094434.GA4425@peter.daprodeges.fqdn.th-h.de>
2007-03-15 21:04 ` Theodore Tso
2007-03-15 22:07 ` Rocco Rutte
2007-03-17 11:37 ` Simon 'corecode' Schubert
2007-03-16 4:53 ` Len Brown [this message]
2007-03-08 9:01 ` Rocco Rutte
2007-03-07 15:59 ` Shawn O. Pearce
2007-03-08 8:56 ` Rocco Rutte
2007-03-07 23:14 ` Shawn O. Pearce
2007-03-08 10:49 ` Rocco Rutte
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200703160053.54699.lenb@kernel.org \
--to=lenb@kernel.org \
--cc=git@vger.kernel.org \
--cc=pdmef@gmx.net \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).