Merge or Cherry-Pick?

[Thiago Macieira]

On Tuesday, 1 de February de 2011 01:23:01 Oswald Buddenhagen wrote:
> just face it, git's merging concept makes most sense for longer-lived
> feature branches, but not so much for bugfix branches. not even linux
> itself uses a forward-merge strategy for bugfix branches.

How does the kernel work then? As far as I know, everything is merged.

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Product Manager - Nokia, Qt Development Frameworks
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20110201/1866388f/attachment.sig>