mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Adam J. Richter" <adam@yggdrasil.com>
To: pasky@ucw.cz
Cc: linux-kernel@vger.kernel.org
Subject: Re: Re: GIT license (Re: Re: Re: Re: Re: [ANNOUNCE] git-pasky-0.1)
Date: Mon, 11 Apr 2005 18:20:18 -0700	[thread overview]
Message-ID: <200504120120.j3C1KII14991@adam.yggdrasil.com> (raw)

On Mon, 11 Apr 2005 20:45:38 +0200, Peter Baudis wrote:
>  Hello,

>  please do not trim the cc list so agressively.

Sorry.  I read the list from a web site that does not show the
cc lists.  I'll try to cc more people from the relevant discussions
though.  On the other hand, I've dropped Linus from this message,
as it just points to something he previously said.

>Dear diary, on Mon, Apr 11, 2005 at 05:46:38PM CEST, I got a letter
>where "Adam J. Richter" <adam@yggdrasil.com> told me that...
>..snip..
>> Graydon Hoare.  (By the way, I would prefer that git just punt to
>> user level programs for diff and merge when all of the versions
>> involved are different or at least have a very thin interface
>> for extending the facility, because I would like to do some character
>> based merge stuff.)
>..snip..

>But this is what git already does. I agree it could do it even better,
>by checking environment variables for the appropriate tools (then you
>could use that to pass diff e.g. -p etc.).

This message from Linus seemed to imply that git was going to get
its own 3-way merge code:

| Then the bad news: the merge algorithm is going to suck. It's going to be
| just plain 3-way merge, the same RCS/CVS thing you've seen before. With no
| understanding of renames etc. I'll try to find the best parent to base the
| merge off of, although early testers may have to tell the piece of crud
| what the most recent common parent was.

( from http://marc.theaimsgroup.com/?l=linux-kernel&m=111320013100822&w=2 )


                    __     ______________
Adam J. Richter        \ /
adam@yggdrasil.com      | g g d r a s i l

             reply	other threads:[~2005-04-12  1:30 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-04-12  1:20 Adam J. Richter [this message]
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
  -- strict thread matches above, loose matches on Subject: below --
2005-04-11 15:46 Adam J. Richter
2005-04-11 18:45 ` Petr Baudis
2005-04-10 18:45 Re: [ANNOUNCE] git-pasky-0.1 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  7:45               ` Ingo Molnar
2005-04-11  8:40                 ` Florian Weimer
2005-04-11 10:52                   ` Petr Baudis

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=200504120120.j3C1KII14991@adam.yggdrasil.com \
    --to=adam@yggdrasil.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pasky@ucw.cz \
    /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

all inboxes | Powered by JetHome®