From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Schindelin Subject: Re: [DOC BUG] branch.autosetupmerge defaults to true, not false Date: Mon, 11 Feb 2008 11:36:22 +0000 (GMT) Message-ID: References: <87bq6nc22l.fsf@Astalo.kon.iki.fi> <7vejbjam9g.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: Kalle Olavi Niemitalo , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Feb 11 12:36:52 2008 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 1JOWxt-0002Yy-5y for gcvg-git-2@gmane.org; Mon, 11 Feb 2008 12:36:49 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751967AbYBKLgO (ORCPT ); Mon, 11 Feb 2008 06:36:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751936AbYBKLgO (ORCPT ); Mon, 11 Feb 2008 06:36:14 -0500 Received: from mail.gmx.net ([213.165.64.20]:58467 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751934AbYBKLgN (ORCPT ); Mon, 11 Feb 2008 06:36:13 -0500 Received: (qmail invoked by alias); 11 Feb 2008 11:36:11 -0000 Received: from unknown (EHLO [138.251.11.74]) [138.251.11.74] by mail.gmx.net (mp051) with SMTP; 11 Feb 2008 12:36:11 +0100 X-Authenticated: #1490710 X-Provags-ID: V01U2FsdGVkX18qePQ9RukqOCE7coyikCmdwgFnB6tyEX9nAEQbNj 8o1r5jZW71M53p X-X-Sender: gene099@racer.site In-Reply-To: User-Agent: Alpine 1.00 (LSU 882 2007-12-20) X-Y-GMX-Trusted: 0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Hi, On Mon, 11 Feb 2008, Johannes Schindelin wrote: > [PATCH] Document that the default of branch.autosetupmerge is true Ooops. That should have been the subject. Embarassed, Dscho