From: Santi <sbejar@gmail.com>
Date: Sun, 24 Sep 2006 23:18:10 GMT
Subject: Re: [CFH] Remotes conversion script
Message-ID: <8aa486160609241618w32501999rc7dcec1d16db440e@mail.gmail.com>
In-Reply-To: <ef730t$dk9$3@sea.gmane.org>

2006/9/25, Jakub Narebski <jnareb@gmail.com>:
> Johannes Schindelin wrote:
>
> > On Sun, 24 Sep 2006, Jakub Narebski wrote:
> >
> >> If I remember correctly currently only some functionality provided by
> >> remotes file can be provided by [remote] and [branch] sections of git
> >> config.
> >
> > ... and what might the lacking functionality be?
>
> What about
>         Pull: +refs/heads/pu:refs/heads/pu
> functionality, i.e. allowing force-update (non fast-forward) fetches?

[remote "git"]
url = git://.../git.git
fetch = +refs/heads/pu:refs/heads/pu

>
> > .git/remotes/<name>    config
> >
> > URL:                   remote.<name>.url
> > Pull:                  remote.<name>.fetch
> > Push:                  remote.<name>.push
> >
> > You can even have multiple entries in the config, and it behaves as if you
> > had multiple lines in .git/remotes/<name>.
>
> And first pull line is default branch to merge, all the rest is marked
> as not-for-merge?

The same way as with .git/remotes/.

the .git/remotes/ files and the [remote] sections are equivalent, modulo bugs.

   Santi