Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932560AbVI3SOc (ORCPT ); Fri, 30 Sep 2005 14:14:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932581AbVI3SOb (ORCPT ); Fri, 30 Sep 2005 14:14:31 -0400 Received: from smtp.osdl.org ([65.172.181.4]:55012 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S932560AbVI3SOa (ORCPT ); Fri, 30 Sep 2005 14:14:30 -0400 Date: Fri, 30 Sep 2005 11:14:22 -0700 (PDT) From: Linus Torvalds To: Junio C Hamano cc: Jeff Garzik , Linux Kernel , git@vger.kernel.org Subject: Re: [howto] Kernel hacker's guide to git, updated In-Reply-To: <7v64si4von.fsf@assigned-by-dhcp.cox.net> Message-ID: References: <433BC9E9.6050907@pobox.com> <20050929200252.GA31516@redhat.com> <433C4B6D.6030701@pobox.com> <7virwjegb5.fsf@assigned-by-dhcp.cox.net> <433D1E5D.20303@pobox.com> <7v64si4von.fsf@assigned-by-dhcp.cox.net> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 968 Lines: 28 On Fri, 30 Sep 2005, Junio C Hamano wrote: > > I suspect the version Linus posted has a funny interaction with > 'git-pull'; 'git pull --tags' by mistake, or intentionally to > file a bug report to annoy me ;-), would create an Octopus out > of those tags, if I am not mistaken. Hey, even more impressive is "git pull --all", which will happily try to create an octopus of every single ref available at the other end. Now, I think that octopus merges in _general_ are likely to be driver error, and that it might make sense to have a separate flag to enable them in the first place. That would solve the confusion.. So then you could do git pull --all --octopus xyzzy if you _really_ meant to do that. 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/