From: Junio C Hamano <junkio@cox.net>
To: Daniel Barkalow <barkalow@iabervon.org>
Cc: git@vger.kernel.org
Subject: Re: Multi-ancestor read-tree notes
Date: Thu, 08 Sep 2005 15:00:04 -0700 [thread overview]
Message-ID: <7vy867te3f.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.63.0509081727560.23242@iabervon.org> (Daniel Barkalow's message of "Thu, 8 Sep 2005 17:39:47 -0400 (EDT)")
Daniel Barkalow <barkalow@iabervon.org> writes:
> I assume that what you want is something to include everything from two
> commits, which would give conflicts if a name is reused?
My understanding is that Darrin wants to do what Linus did when
he merged gitk into git.git.
Personally I think that is a specialized application and
something like the git-merge-projects script I posted as a
follow-up would be more appropriate than adding it to the
current merge discussion.
next prev parent reply other threads:[~2005-09-08 22:00 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-05 5:41 Multi-ancestor read-tree notes Daniel Barkalow
2005-09-06 5:42 ` Junio C Hamano
2005-09-06 17:43 ` Daniel Barkalow
2005-09-06 20:03 ` Junio C Hamano
2005-09-06 20:25 ` Daniel Barkalow
2005-09-06 21:53 ` Junio C Hamano
2005-09-06 22:59 ` Daniel Barkalow
2005-09-10 22:50 ` Junio C Hamano
2005-09-10 22:56 ` Junio C Hamano
2005-09-08 17:16 ` Darrin Thompson
2005-09-08 20:37 ` Fredrik Kuivinen
2005-09-08 21:39 ` Daniel Barkalow
2005-09-08 21:54 ` Darrin Thompson
2005-09-08 22:00 ` Junio C Hamano [this message]
2005-09-08 22:10 ` Daniel Barkalow
2005-09-09 17:29 ` Junio C Hamano
2005-09-09 20:44 ` Daniel Barkalow
2005-09-11 16:45 ` Matthias Urlichs
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=7vy867te3f.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.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).