From: Chris Friesen <cfriesen@nortel.com>
To: Petr Baudis <pasky@ucw.cz>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
"Adam J. Richter" <adam@yggdrasil.com>,
torvalds@osdl.org,
Linux Kernel Development <linux-kernel@vger.kernel.org>
Subject: Re: GIT license (Re: Re: Re: Re: Re: [ANNOUNCE] git-pasky-0.1)
Date: Tue, 12 Apr 2005 15:01:44 -0600 [thread overview]
Message-ID: <425C3738.5090407@nortel.com> (raw)
In-Reply-To: <20050412192924.GA26542@pasky.ji.cz>
Petr Baudis wrote:
> Dear diary, on Tue, Apr 12, 2005 at 11:50:48AM CEST, I got a letter
>>Well, yes, but the last merge point search may not be so simple:
>>
>>A --1---2----6---7
>>B \ `-4-. /
>>C `-3-----5'
>>
>>Now, when at 7, your last merge point is not 1, but 2.
>
>
> ...and this is obviously wrong, sorry. You would lose 3 this way.
Wouldn't the delta betweeen 2 and 5 include any contribution from 3?
Chris
next prev parent reply other threads:[~2005-04-12 21:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-12 1:20 Re: GIT license (Re: Re: Re: Re: Re: [ANNOUNCE] git-pasky-0.1) Adam J. Richter
2005-04-12 1:42 ` Petr Baudis
2005-04-12 8:39 ` Geert Uytterhoeven
2005-04-12 9:50 ` Petr Baudis
2005-04-12 19:29 ` Petr Baudis
2005-04-12 21:01 ` Chris Friesen [this message]
-- strict thread matches above, loose matches on Subject: below --
2005-04-11 15:46 Adam J. Richter
2005-04-11 5:18 Nur Hussein
2005-04-10 16:27 [ANNOUNCE] git-pasky-0.1 Petr Baudis
2005-04-10 17:33 ` Ingo Molnar
2005-04-10 17:42 ` Willy Tarreau
2005-04-10 17:45 ` Ingo Molnar
2005-04-10 18:45 ` Petr Baudis
2005-04-10 20:38 ` Linus Torvalds
2005-04-10 22:27 ` Petr Baudis
2005-04-10 23:10 ` Linus Torvalds
2005-04-10 23:26 ` Petr Baudis
2005-04-10 23:46 ` Linus Torvalds
2005-04-10 23:56 ` Petr Baudis
2005-04-11 0:20 ` GIT license (Re: Re: Re: Re: Re: [ANNOUNCE] git-pasky-0.1) Linus Torvalds
2005-04-11 0:27 ` Petr Baudis
2005-04-11 7:45 ` Ingo Molnar
2005-04-11 8:40 ` Florian Weimer
2005-04-11 10:52 ` Petr Baudis
2005-04-11 16:05 ` Florian Weimer
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=425C3738.5090407@nortel.com \
--to=cfriesen@nortel.com \
--cc=adam@yggdrasil.com \
--cc=geert@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pasky@ucw.cz \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox