From: Jakub Narebski <jnareb@gmail.com>
Date: Fri, 22 Dec 2006 20:04:09 GMT
Subject: Re: What's in git.git (stable)
Message-ID: <emhdir$he9$1@sea.gmane.org>
In-Reply-To: <7vwt4jzrjb.fsf@assigned-by-dhcp.cox.net>

<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?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git