Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933130Ab3CLRvr (ORCPT ); Tue, 12 Mar 2013 13:51:47 -0400 Received: from mail-ie0-f169.google.com ([209.85.223.169]:41043 "EHLO mail-ie0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932355Ab3CLRvp (ORCPT ); Tue, 12 Mar 2013 13:51:45 -0400 MIME-Version: 1.0 In-Reply-To: References: <20130312100950.e45ef0e721492ff0d5fd7c8d@canb.auug.org.au> <20130312041641.GE18595@thunk.org> Date: Tue, 12 Mar 2013 18:51:44 +0100 X-Google-Sender-Auth: RRPze5wdhlAF2RStTnStK3nZwkg Message-ID: Subject: Re: linux-next: unneeded merge in the security tree From: Geert Uytterhoeven To: Linus Torvalds Cc: "Theodore Ts'o" , James Morris , Stephen Rothwell , linux-next@vger.kernel.org, Linux Kernel Mailing List , Git Mailing List , Junio C Hamano Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1582 Lines: 34 On Tue, Mar 12, 2013 at 6:13 PM, Linus Torvalds wrote: >> Why not just force the head of the security tree to be v3.9-rc2? Then >> you don't end up creating a completely unnecessary merge commit, and >> users who were at the previous head of the security tree will >> experience a fast forward when they pull your new head. > > So I think that may *technically* be the right solution, but it's a > rather annoying UI issue, partly because you can't just do it in a > single operation (you can't do a pull of the tag to both fetch and > fast-forward it), but partly because "git reset --hard" is also an > operation that can lose history, so it's something that people should > be nervous about, and shouldn't use as some kind of standard "let's > just fast-forward to Linus' tree" thing. In many cases, "git rebase x" does the exact same thing as "git reset --hard x", with an added safeguard: if you forgot to upstream something, it'll boil up on top of "x". Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- 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/