Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261724AbVDSXCq (ORCPT ); Tue, 19 Apr 2005 19:02:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261730AbVDSXCq (ORCPT ); Tue, 19 Apr 2005 19:02:46 -0400 Received: from w241.dkm.cz ([62.24.88.241]:42696 "HELO machine.sinus.cz") by vger.kernel.org with SMTP id S261724AbVDSXCg (ORCPT ); Tue, 19 Apr 2005 19:02:36 -0400 Date: Wed, 20 Apr 2005 01:02:33 +0200 From: Petr Baudis To: Linus Torvalds Cc: Steven Cole , Greg KH , Greg KH , Git Mailing List , linux-kernel@vger.kernel.org, sensors@stimpy.netroedge.com Subject: Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2 Message-ID: <20050419230233.GI9305@pasky.ji.cz> References: <20050419043938.GA23724@kroah.com> <20050419185807.GA1191@kroah.com> <426583D5.2020308@mesatop.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4i X-message-flag: Outlook : A program to spread viri, but it can do mail too. Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 809 Lines: 19 Dear diary, on Wed, Apr 20, 2005 at 12:38:17AM CEST, I got a letter where Linus Torvalds told me that... > Just say no to patches. FYI, I've - per Junio's suggestion - made git merge's fast-forward to apply show-diff output as a patch instead. This is roughly equal to doing the sanity check against local changes, except that it handles them, while at it. (Tree merge refuses to work when there are local changes.) -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor - 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/