From: Santi Béjar <sbejar@gmail.com>
Date: Fri, 08 Dec 2006 02:04:21 GMT
Subject: Re: git pull and merging.
Message-ID: <8aa486160612071804t63a86b5ate6b17d8ddcf90a60@mail.gmail.com>
In-Reply-To: <7vac1zqpa3.fsf@assigned-by-dhcp.cox.net>

On 12/8/06, Junio C Hamano <junkio@cox.net> wrote:
> Junio C Hamano <junkio@cox.net> writes:
>
> > Once you place something like "branch.*.merge" in configuration
> > file (either $GIT_DIR/config, or a $GIT_DIR/remotes/* file), you
> > are talking about other repositories you regularly interact
> > with, so it might be probably Ok to require the user to use a
> > tracking branch if he wants the convenience of "branch.*.merge",
> > and make its value name the local tracking branch instead of the
> > remote branch.
>
> In other words, I am all for fixing this.
>
> Although it may not hurt too much if we just redefine the
> meaning of it to name the local tracking branch, using a
> different name "branch.*.defaultmerge" is safer and would not
> break existing repositories.

Or branch.*.localmerge?