From: Martin Waitz <tali@admingilde.org>
Date: Thu, 27 Jul 2006 08:55:16 GMT
Subject: Re: [PATCH] Per branch properties for pull and fetch
Message-ID: <20060727085516.GC27593@admingilde.org>
In-Reply-To: <87lkqfcvm2.fsf@gmail.com>

hoi :)

On Thu, Jul 27, 2006 at 10:14:45AM +0200, Santi Béjar wrote:
> It allows to specify on a per branch basis the following:
> .- default repository to fetch
> .- default branches to merge on a per repository basis
> .- default pull.{octopus,twohead}
> 
> So if you have this in the config:
> [branch "my"]
> 	remote=yours
> 	merge=master
> 	merge=our from theirs
> 	merge=mine from .

could we default the to-be-merged branch to "remotes/$remote/$branch" if
that exists?. That could make life a lot easier when using
clone --use-separate-remote.

-- 
Martin Waitz