Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758581Ab2EBC7J (ORCPT ); Tue, 1 May 2012 22:59:09 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:57212 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758408Ab2EBC7I (ORCPT ); Tue, 1 May 2012 22:59:08 -0400 MIME-Version: 1.0 In-Reply-To: <20120502004439.965120020@goodmis.org> References: <20120502004439.965120020@goodmis.org> From: Linus Torvalds Date: Tue, 1 May 2012 19:58:46 -0700 X-Google-Sender-Auth: 68BXbPYeAstPQ1F_CQEPunfWZK4 Message-ID: Subject: Re: [PATCH 0/2] [GIT PULL] ktest: A couple of fixes To: Steven Rostedt Cc: linux-kernel@vger.kernel.org, Junio C Hamano , Git Mailing List 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: 1432 Lines: 41 On Tue, May 1, 2012 at 5:44 PM, Steven Rostedt wrote: > > Is git set up to not fast forward by default? (I need to give it another try) Git will fast-forward by default if you do a pull and there is no development of your own in your tree. There are two exceptions: - you explicitly say that you don't want to fast-forward (--no-ff or "[merge] ff=false" in the git config file) - if you pull a signed tag with a modern version of git. That second case may be what you hit. If you do a git pull linus v3.4-rc5 in order to just update to the state of my latest tag, then git will assume you want to do a new commit (and thus a non-fast-forward) just so that git can record the tag signature in the commit. The sad part is that I don't think you can even override the second case. IOW, I think even "git pull --ff linus v3.4-rc5" will still do a non-fast-forward merge. That's inconvenient, and an unintended consequence of the behavior I wanted as a top-level maintainer. But I really do think it's wrong for normal developers who might validly just want to update to some particular tagged release. Junio? Any ideas? 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/