From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: confusion over the new branch and merge config Date: Sun, 24 Dec 2006 01:15:50 -0500 Message-ID: <20061224061549.GA17186@segfault.peff.net> References: <7vd56cam66.fsf@assigned-by-dhcp.cox.net> <20061223051210.GA29814@segfault.peff.net> <7vbqlvuoi4.fsf@assigned-by-dhcp.cox.net> <7vbqlvrldk.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Nicolas Pitre , git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Dec 24 07:15:53 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 1GyMeG-0003bM-Q0 for gcvg-git@gmane.org; Sun, 24 Dec 2006 07:15:53 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754133AbWLXGPu (ORCPT ); Sun, 24 Dec 2006 01:15:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754141AbWLXGPu (ORCPT ); Sun, 24 Dec 2006 01:15:50 -0500 Received: from 66-23-211-5.clients.speedfactory.net ([66.23.211.5]:3895 "HELO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754133AbWLXGPt (ORCPT ); Sun, 24 Dec 2006 01:15:49 -0500 Received: (qmail 17343 invoked by uid 1000); 24 Dec 2006 01:15:50 -0500 To: Junio C Hamano Content-Disposition: inline In-Reply-To: <7vbqlvrldk.fsf@assigned-by-dhcp.cox.net> Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On Sat, Dec 23, 2006 at 01:51:03AM -0800, Junio C Hamano wrote: > If you (or other people) use branch.*.merge, with its value set > to remote name _and_ local name, and actually verify that either > form works without confusion, please report back and I'll apply. I am happy to try this out and report back. However, I'm out of town for the holidays, so I won't have anything useful to say until next week. -Peff