From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carl Worth Subject: Re: best git practices, was Re: Git User's Survey 2007 unfinished summary continued Date: Thu, 25 Oct 2007 12:04:35 -0700 Message-ID: <87r6jjrp6k.wl%cworth@cworth.org> References: <8fe92b430710081355i7d3dbaa2q9a8939b55d7ca7dc@mail.gmail.com> <1192827476.4522.93.camel@cacharro.xalalinux.org> <4719B655.90204@op5.se> <8fe92b430710201606i47e85b24k17abd819bf0d353b@mail.gmail.com> <471AFD07.4040606@op5.se> <471C586A.9030900@op5.se> <471C9B13.9080603@op5.se> <471CB443.9070606@op5.se> <471CBEB1.2030008@op5.se> <1193081785.4522.181.camel@cacharro.xalalinux.org> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: multipart/signed; boundary="pgp-sign-Multipart_Thu_Oct_25_12:03:27_2007-1"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit Cc: Federico Mena Quintero , Andreas Ericsson , git@vger.kernel.org To: Johannes Schindelin X-From: git-owner@vger.kernel.org Thu Oct 25 21:06:21 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1Il81j-0006iL-9H for gcvg-git-2@gmane.org; Thu, 25 Oct 2007 21:05:55 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755458AbXJYTF2 (ORCPT ); Thu, 25 Oct 2007 15:05:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755366AbXJYTF2 (ORCPT ); Thu, 25 Oct 2007 15:05:28 -0400 Received: from olra.theworths.org ([82.165.184.25]:63332 "EHLO olra.theworths.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755330AbXJYTFZ (ORCPT ); Thu, 25 Oct 2007 15:05:25 -0400 Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 880B9431FB0; Thu, 25 Oct 2007 12:05:24 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VGBsafe0+sPY; Thu, 25 Oct 2007 12:05:23 -0700 (PDT) Received: from raht.cworth.org (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 0FA2E431FB1; Thu, 25 Oct 2007 12:05:22 -0700 (PDT) In-Reply-To: User-Agent: Wanderlust/2.14.0 (Africa) Emacs/21.4 Mule/5.0 (SAKAKI) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: --pgp-sign-Multipart_Thu_Oct_25_12:03:27_2007-1 Content-Type: text/plain; charset=US-ASCII On Tue, 23 Oct 2007 00:21:03 +0100 (BST), Johannes Schindelin wrote: > On Mon, 22 Oct 2007, Federico Mena Quintero wrote: > > > > The "branches should not track their origin by default" Did this change recently? I just wrote a long message arguing for the "autosetupmerge = 1" behavior by default, but when I tested with 1.5.3.4 it seems to be there already. Am I seeing that correctly? If so, thank you and congratulations! Not having to pass --track nor manually configure autosetupmerge to get this very useful behavior is a very nice change! A nice followup would be to improve the documentation for "git pull" to better indicate some of the smarts that are now inherent in it. I'll take a whack at that, (just as soon as I finish reading the rest of this giant thread...). -Carl --pgp-sign-Multipart_Thu_Oct_25_12:03:27_2007-1 Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBHIOjD6JDdNq8qSWgRAjvHAJ9FlhPho8PEK4bX8e7E8oYNkdEDzACgnqAa o918q2Ob6G32DjZwrgs8sLE= =XCMg -----END PGP SIGNATURE----- --pgp-sign-Multipart_Thu_Oct_25_12:03:27_2007-1--