From: Santi <sbejar@gmail.com>
Date: Thu, 27 Jul 2006 10:06:34 GMT
Subject: Re: [PATCH] Per branch properties for pull and fetch
Message-ID: <8aa486160607270306s3f49a01cq91ef61e2c9f005e@mail.gmail.com>
In-Reply-To: <8aa486160607270240h412b0dcek1d57eeb2b254fb2e@mail.gmail.com>

2006/7/27, Santi <sbejar@gmail.com>:
> 2006/7/27, Martin Waitz <tali@admingilde.org>:
> > 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.
>
> I would prefer to change git-clone and git-branch to write the full
> config. And I'll do this if this or someting like this is accepted.
>

On the other hand, my patch changes the behaviour only when explicitly
configured, and your proposed default would change the behaviour even
without changes to the config.

Santi