From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.1 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Linus Torvalds Subject: Re: [PATCH] git-pull: refuse default merge without branch.*.merge Date: Sat, 16 Dec 2006 08:44:40 -0800 (PST) Message-ID: References: <7v4przfpir.fsf@assigned-by-dhcp.cox.net> <7vfybgjj7k.fsf@assigned-by-dhcp.cox.net> <7v3b7gji73.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII NNTP-Posting-Date: Sat, 16 Dec 2006 16:44:59 +0000 (UTC) Cc: git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org In-Reply-To: <7v3b7gji73.fsf@assigned-by-dhcp.cox.net> X-MIMEDefang-Filter: osdl$Revision: 1.163 $ X-Scanned-By: MIMEDefang 2.36 Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by dough.gmane.org with esmtp (Exim 4.50) id 1GvceX-0005D5-1w for gcvg-git@gmane.org; Sat, 16 Dec 2006 17:44:49 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161185AbWLPQoq (ORCPT ); Sat, 16 Dec 2006 11:44:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161186AbWLPQoq (ORCPT ); Sat, 16 Dec 2006 11:44:46 -0500 Received: from smtp.osdl.org ([65.172.181.25]:54777 "EHLO smtp.osdl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161185AbWLPQoq (ORCPT ); Sat, 16 Dec 2006 11:44:46 -0500 Received: from shell0.pdx.osdl.net (fw.osdl.org [65.172.181.6]) by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id kBGGifID021441 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Sat, 16 Dec 2006 08:44:43 -0800 Received: from localhost (shell0.pdx.osdl.net [10.9.0.31]) by shell0.pdx.osdl.net (8.13.1/8.11.6) with ESMTP id kBGGieiB022495; Sat, 16 Dec 2006 08:44:40 -0800 To: Junio C Hamano Sender: git-owner@vger.kernel.org On Sat, 16 Dec 2006, Junio C Hamano wrote: > > Everybody hated the pull behaviour of merging the first branch > listed on remotes/* file (or remote.*.fetch config) into the > current branch. This finally corrects that UI wart by > forbidding "git pull" without an explicit branch name on the > command line or branch.$current.merge for the current branch. Yay! May I suggest also just merging the built-in 3-way merge, and just calling the resulting version 1.5.0? With all the "git add" and documentation cleanups, and these kinds of fundamental changes in behaviour (not that anybody will hopefully _notice_, and if they do they'll hopefully just be grateful, but it's still conceptually a big step), I think it's definitely worth a new version number. Maybe even "2.0", although since we're still backwards compatible in all ways that really matter, a major number might be too big a step.