From mboxrd@z Thu Jan 1 00:00:00 1970 From: merlyn@stonehenge.com (Randal L. Schwartz) Subject: Re: What's in git.git (stable) Date: 22 Dec 2006 09:19:56 -0800 Message-ID: <86fyb7sv9f.fsf@blue.stonehenge.com> References: <7vodpw46zj.fsf@assigned-by-dhcp.cox.net> <86k60jsvh8.fsf@blue.stonehenge.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Dec 22 18:20:11 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by dough.gmane.org with esmtp (Exim 4.50) id 1Gxo3v-0002Rb-VD for gcvg-git@gmane.org; Fri, 22 Dec 2006 18:20:04 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751247AbWLVRT6 (ORCPT ); Fri, 22 Dec 2006 12:19:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751269AbWLVRT6 (ORCPT ); Fri, 22 Dec 2006 12:19:58 -0500 Received: from blue.stonehenge.com ([209.223.236.162]:32052 "EHLO blue.stonehenge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751247AbWLVRT5 (ORCPT ); Fri, 22 Dec 2006 12:19:57 -0500 Received: from localhost (localhost [127.0.0.1]) by blue.stonehenge.com (Postfix) with ESMTP id 340948FE99; Fri, 22 Dec 2006 09:19:57 -0800 (PST) Received: from blue.stonehenge.com ([127.0.0.1]) by localhost (blue.stonehenge.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 17416-01-32; Fri, 22 Dec 2006 09:19:56 -0800 (PST) Received: by blue.stonehenge.com (Postfix, from userid 1001) id 9EBEA8FE9F; Fri, 22 Dec 2006 09:19:56 -0800 (PST) To: Junio C Hamano x-mayan-date: Long count = 12.19.13.16.9; tzolkin = 10 Muluc; haab = 2 Kankin In-Reply-To: <86k60jsvh8.fsf@blue.stonehenge.com> User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.4 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: >>>>> "Randal" == Randal L Schwartz writes: >>>>> "Junio" == Junio C Hamano writes: Junio> git-pull: refuse default merge without branch.*.merge Randal> Argh. How do I get back the old behavior? Randal> "git-pull origin" doesn't seem to be enough. Randal> You just broke a bunch of automated scripts for me. Ahh, it's "git-pull . origin". Maybe a bit more warning for non-upward-compatible changes though, please. Or maybe we should presume everything is non-upward compatible? I didn't think a naked "git-pull" was that out of the ordinary. -- Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095 Perl/Unix/security consulting, Technical writing, Comedy, etc. etc. See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!