From mboxrd@z Thu Jan 1 00:00:00 1970 From: Theodore Ts'o Subject: Re: linux-next: unneeded merge in the security tree Date: Tue, 12 Mar 2013 22:30:26 -0400 Message-ID: <20130313023026.GD16919@thunk.org> References: <7vtxog5msj.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: James Morris , Stephen Rothwell , linux-next@vger.kernel.org, Linux Kernel Mailing List , Git Mailing List To: Linus Torvalds , Junio C Hamano X-From: git-owner@vger.kernel.org Wed Mar 13 03:31:23 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UFbTO-00057U-W1 for gcvg-git-2@plane.gmane.org; Wed, 13 Mar 2013 03:31:23 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755821Ab3CMCad (ORCPT ); Tue, 12 Mar 2013 22:30:33 -0400 Received: from li9-11.members.linode.com ([67.18.176.11]:53013 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755550Ab3CMCac (ORCPT ); Tue, 12 Mar 2013 22:30:32 -0400 Received: from root (helo=closure.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.80) (envelope-from ) id 1UFbSV-0001Pm-O4; Wed, 13 Mar 2013 02:30:27 +0000 Received: by closure.thunk.org (Postfix, from userid 15806) id 4BBDE42C380; Tue, 12 Mar 2013 22:30:26 -0400 (EDT) Mail-Followup-To: Theodore Ts'o , Linus Torvalds , Junio C Hamano , James Morris , Stephen Rothwell , linux-next@vger.kernel.org, Linux Kernel Mailing List , Git Mailing List Content-Disposition: inline In-Reply-To: <7vtxog5msj.fsf@alter.siamese.dyndns.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Tue, Mar 12, 2013 at 02:30:04PM -0700, Junio C Hamano wrote: > Theodore Ts'o writes: > > > [remote "origin"] > > url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git > > fetch = +refs/heads/master:refs/heads/master > > mergeoptions = --ff-only > > > > Is there an escape hatch for that rare case? IOW, how does a > submaintainer who configured the above to override --ff-only? Hmm, maybe we would need to add a --no-ff-only? Or they could just do: git fetch origin git merge FETCH_HEAD On Tue, Mar 12, 2013 at 02:28:39PM -0700, Linus Torvalds wrote: > > Of course, I'm not really sure if we want to list the flags. Maybe > it's better to just introduce the notion of "upstream" directly, and > make that a flag, and make "origin" default to that when you clone. > And then have git use different heurstics for pulling upstream (like > warning by default when doing a back-merge, perhaps?) What if git automaticallly set up the origin branch to have a certain set of mergeoptions by default? That would probably be right for most users, but it makes it obvious what's going on when they take a look at the .git/config file, and doesn't make the remote that happens to have the name "origin" as having certain magic properties. Using a set of mergeoptions would also be bit more general, and might have applications in the future. - Ted