From: Darrin Thompson <darrint@progeny.com>
To: Daniel Barkalow <barkalow@iabervon.org>
Cc: git@vger.kernel.org
Subject: Re: Multi-ancestor read-tree notes
Date: Thu, 08 Sep 2005 16:54:55 -0500 [thread overview]
Message-ID: <1126216495.3984.4.camel@localhost.localdomain> (raw)
In-Reply-To: <Pine.LNX.4.63.0509081727560.23242@iabervon.org>
On Thu, 2005-09-08 at 17:39 -0400, Daniel Barkalow wrote:
> I assume that what you want is something to include everything from two
> commits, which would give conflicts if a name is reused?
>
Yes.
--
Darrin
next prev parent reply other threads:[~2005-09-08 21:55 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 [this message]
2005-09-08 22:00 ` Junio C Hamano
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=1126216495.3984.4.camel@localhost.localdomain \
--to=darrint@progeny.com \
--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 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.