From: Junio C Hamano <junkio@cox.net>
Date: Fri, 22 Dec 2006 20:16:55 GMT
Subject: Re: What's in git.git (stable)
Message-ID: <7vejqrznwo.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <emhdir$he9$1@sea.gmane.org>

Jakub Narebski <jnareb@gmail.com> writes:

> <opublikowany i wysłany>
>
> Junio C Hamano wrote:
>
>> Possibilities:
>> 
>>  (1) Forget about that "protection" business.  If you do not
>>      want mistakes, use 'branch.*.merge' but otherwise we will
>>      continue to follow the good old "first set of branches"
>>      rule.
>
> What about marking default branch to merge explicitely using
> "Merge:" in remotes/<repo>, or remote.<name>.merge?

Sorry, how is that an improvement over the current branch.*.merge?
and how would that help not breaking existing setups?