From: Junio C Hamano <gitster@pobox.com>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: Sean <seanlkml@sympatico.ca>, git@vger.kernel.org
Subject: Re: [PATCH] Add [HOWTO] using merge subtree.
Date: Tue, 08 Jan 2008 22:28:16 -0800 [thread overview]
Message-ID: <7v8x2zpl6n.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7vfxx7psoq.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Tue, 08 Jan 2008 19:46:13 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> * http://thread.gmane.org/gmane.comp.version-control.git/39443
>
> This was the explanation on the way how the initial git-gui
> subtree merge was created.
For the record, the very first cross-project merge is:
http://thread.gmane.org/gmane.comp.version-control.git/5126
The procedure to maintain the resulting re-merge of two
histories do not involve subtree merge because "The coolest
merge ever" merges non-overlapping two trees at the same level,
but the principle used to bootstrap the process is the same.
You prepare a tree that is a overlay of the tips of your two
projects, and record that tree in a commit that is a merge
between two parents.
next prev parent reply other threads:[~2008-01-09 6:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1199838182-15178-1-git-send-email-vmiklos@frugalware.org>
2008-01-09 1:35 ` [PATCH] Add [HOWTO] using merge subtree Junio C Hamano
2008-01-09 3:46 ` Junio C Hamano
2008-01-09 6:28 ` Junio C Hamano [this message]
[not found] <1199882097-10420-1-git-send-email-vmiklos@frugalware.org>
2008-01-09 22:33 ` Junio C Hamano
2008-01-15 0:35 ` Miklos Vajna
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=7v8x2zpl6n.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=seanlkml@sympatico.ca \
--cc=vmiklos@frugalware.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 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).