Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261396AbVDWAT3 (ORCPT ); Fri, 22 Apr 2005 20:19:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261376AbVDWAT2 (ORCPT ); Fri, 22 Apr 2005 20:19:28 -0400 Received: from fire.osdl.org ([65.172.181.4]:48523 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S261398AbVDWATX (ORCPT ); Fri, 22 Apr 2005 20:19:23 -0400 Date: Fri, 22 Apr 2005 17:21:19 -0700 (PDT) From: Linus Torvalds To: Pavel Machek cc: Petr Baudis , kernel list Subject: Re: Linux 2.6.12-rc3 In-Reply-To: <20050422231839.GC1789@elf.ucw.cz> Message-ID: References: <20050421112022.GB2160@elf.ucw.cz> <20050421120327.GA13834@elf.ucw.cz> <20050421162220.GD30991@pasky.ji.cz> <20050421232201.GD31207@elf.ucw.cz> <20050422002150.GY7443@pasky.ji.cz> <20050422231839.GC1789@elf.ucw.cz> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 911 Lines: 23 On Sat, 23 Apr 2005, Pavel Machek wrote: > > Unfortunately first merge will make it practically unusable :-(. No, quite the reverse. If I merge from you, and you use my commit ID as the "base" point, it will work again. But yes, if you actually send the result as _patches_ to me, then the commit objects I create will be totally separate from the commit objects you had in your tree, and "git-export" will continue to export your old stale entries since they won't show up as already being in my tree. The point being, that there is a big difference between a proper merge (with history etc merged) and just sending me the patches in your tree. Linus - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/