Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754755Ab1CKAez (ORCPT ); Thu, 10 Mar 2011 19:34:55 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:60155 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753044Ab1CKAex (ORCPT ); Thu, 10 Mar 2011 19:34:53 -0500 MIME-Version: 1.0 In-Reply-To: References: <20110310.153444.115930379.davem@davemloft.net> <20110310.155556.48513201.davem@davemloft.net> From: Linus Torvalds Date: Thu, 10 Mar 2011 16:34:32 -0800 Message-ID: Subject: Re: [GIT] Networking To: David Miller Cc: akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 757 Lines: 19 On Thu, Mar 10, 2011 at 4:29 PM, Linus Torvalds wrote: > > Oh well. Water under the bridge. I think I'll try --no-ff this once, > despite my misgivings about the concept. Oh wow. That really does end up looking odd. I know some other git projects use --no-ff, but I don't think we've ever had them in the kernel, and I've never see the graph look like that before. But it did allow me to add an explanation for what happened, so maybe it's worth it. 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/