From: Jon Seymour <jon.seymour@gmail.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: The coolest merge EVER!
Date: Thu, 23 Jun 2005 10:12:09 +1000 [thread overview]
Message-ID: <2cfc4032050622171258636771@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.58.0506221433540.2353@ppc970.osdl.org>
On 6/23/05, Linus Torvalds <torvalds@osdl.org> wrote:
>
> Ok, Junio had some cool octopus merges, but I just one-upped him.
>
> I just merged the "gitk" repository into git, and I did it as a real git
> merge, which means that I actually retained all the original gitk
> repository information intact. IOW, it's not a "import the data" thing,
> it's literally a merge of the two trees, and the result has two roots.
>
> Now, the advantage of this kind of merge is that Paul's original gitk
> repository is totally unaffected by it, yet because I now have his history
> (and the exact same objects), the normal kind of git merge should work
> fine for me to continue to import Paul's work - we have the common parent
> needed to resolve all differences.
>
You do realise what this means, don't you?
The Borg can now start accumulating software into one massive
repository of everything ever written and it will never forget -
resistance will be futile.
Of course, it may run out of disk space.
jon.
next prev parent reply other threads:[~2005-06-23 0:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-22 21:46 The coolest merge EVER! Linus Torvalds
2005-06-23 0:12 ` Jon Seymour [this message]
2005-06-23 0:24 ` Jeff Garzik
2005-06-24 0:44 ` Junio C Hamano
2005-06-24 11:54 ` Matthias Urlichs
2005-06-24 17:49 ` Daniel Barkalow
2005-06-24 19:22 ` Linus Torvalds
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=2cfc4032050622171258636771@mail.gmail.com \
--to=jon.seymour@gmail.com \
--cc=git@vger.kernel.org \
--cc=jon@blackcubes.dyndns.org \
--cc=torvalds@osdl.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.