From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: Re: [GIT] Networking Date: Fri, 11 Mar 2011 10:40:23 +1000 Message-ID: References: <20110310.153444.115930379.davem@davemloft.net> <20110310.155556.48513201.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Cc: David Miller , akpm@linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org To: Linus Torvalds Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On Fri, Mar 11, 2011 at 10:34 AM, Linus Torvalds wrote: > 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. I didn't realise we weren't meant to --no-ff, I've been lately using --no-ff --log so I can keep track of what I merged easier, when someone bases something on my tree and I haven't moved it in a while. Though I suppose author/committer info should tell me this I've found having the logs at least a bit useful. Dave.