git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: Alan Chandler <alan@chandlerfamily.org.uk>, git@vger.kernel.org
Subject: Re: What to expect after 0.99.8
Date: Tue, 4 Oct 2005 14:07:06 -0700	[thread overview]
Message-ID: <20051004210706.GA16161@kroah.com> (raw)
In-Reply-To: <43419DD4.5040508@zytor.com>

On Mon, Oct 03, 2005 at 02:08:36PM -0700, H. Peter Anvin wrote:
> 
> I believe in the medium-to-long term a plugin architecture for merging 
> is imperative.  It's not even different media types, but some *files* 
> have specific merging policies.  Think, for example, of pci.ids in the 
> Linux kernel tree.

You mean the file that is now removed from the kernel tree?  Sure,
that's a good merge policy :)

greg k-h

  reply	other threads:[~2005-10-04 21:08 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-10-03  0:14 What to expect after 0.99.8 Junio C Hamano
2005-10-03  3:06 ` A Large Angry SCM
2005-10-03  4:00   ` Junio C Hamano
2005-10-03  6:13     ` [PATCH] Enable and fix support for base less merges Fredrik Kuivinen
     [not found]       ` <46a038f90510022334k63884c6x377104e7eca29c48@mail.gmail.com>
2005-10-04  6:07         ` Fredrik Kuivinen
     [not found]           ` <46a038f90510032322t6623c8d4y969e4e00bf4dfe26@mail.gmail.com>
2005-10-05 20:32             ` Fredrik Kuivinen
2005-10-05 21:22               ` Junio C Hamano
2005-10-03 15:09     ` What to expect after 0.99.8 Horst von Brand
2005-10-03 12:55 ` Josef Weidendorfer
2005-10-04  5:57   ` Junio C Hamano
2005-10-04  9:08     ` Josef Weidendorfer
2005-10-04 18:53       ` Junio C Hamano
2005-10-03 17:16 ` [PATCH] Random documentation fixes Jonas Fonseca
2005-10-03 19:43 ` What to expect after 0.99.8 Daniel Barkalow
2005-10-03 19:55   ` Martin Coxall
2005-10-03 20:02   ` Nick Hengeveld
2005-10-03 20:12     ` Daniel Barkalow
2005-10-03 21:00   ` Junio C Hamano
2005-10-03 21:33     ` Daniel Barkalow
2005-10-03 22:06       ` Junio C Hamano
2005-10-03 23:16         ` Linus Torvalds
2005-10-04  7:12           ` Dan Aloni
2005-10-04  7:31             ` Daniel Barkalow
2005-10-04 14:19               ` Matthias Urlichs
2005-10-04 14:51                 ` H. Peter Anvin
2005-10-04 15:46                   ` Matthias Urlichs
2005-10-04 16:35                     ` H. Peter Anvin
2005-10-04 22:01                       ` Junio C Hamano
2005-10-05  0:10                         ` Linus Torvalds
2005-10-05  2:48                         ` H. Peter Anvin
2005-10-04 16:41                 ` Daniel Barkalow
2005-10-04 17:40                   ` H. Peter Anvin
2005-10-04  4:13         ` Daniel Barkalow
2005-10-03 19:48 ` Alan Chandler
2005-10-03 21:08   ` H. Peter Anvin
2005-10-04 21:07     ` Greg KH [this message]
2005-10-05  2:38       ` H. Peter Anvin
2005-10-03 21:39   ` Horst von Brand
2005-10-03 20:48 ` Matthias Urlichs
2005-10-04 21:52 ` Chuck Lever
2005-10-04 22:38   ` Junio C Hamano

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=20051004210706.GA16161@kroah.com \
    --to=greg@kroah.com \
    --cc=alan@chandlerfamily.org.uk \
    --cc=git@vger.kernel.org \
    --cc=hpa@zytor.com \
    /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).